Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/mapper/integral/IntegralItemMapper.xml

@@ -113,7 +113,7 @@
         left join dkic_a.t_a_company tac on tac.cp_id = tmii.cp_id
         left join dkic_a.t_a_company tacf on tacf.cp_id = tmii.cp_id
         <include refid="Condition"/>
-        order by tmii.acc_date desc
+        order by tmii.acc_date desc, tmii.user_id
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/oauth/service/integral/CouponSendService.java

@@ -29,6 +29,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 @Service
 @Transactional
@@ -178,6 +179,8 @@ public class CouponSendService extends BaseService<CouponSend> {
         Integer linkValidTimes = couponResponses.get(0).getLinkValidTimes();
         couponSendVO.setEndDate(couponSendVO.getSendDate().plusHours(linkValidTimes));
         CouponSend couponSend = couponSendConvert.convertToPo(couponSendVO);
+        UUID uuid = UUID.randomUUID();
+        couponSend.setSendId(uuid.toString());
         couponSendMapper.insert(couponSend);
         return couponSend;
     }