加入优惠券核销功能

java110-db/src/main/resources/mapper/acct/CouponPropertyUserDetailV1ServiceDaoImplMapper.xml

@@ -19,7 +19,7 @@
     <select id="getCouponPropertyUserDetailInfo" parameterType="Map" resultType="Map">
         select t.detail_type,t.detail_type detailType,t.coupon_name,t.coupon_name couponName,t.uo_id,t.uo_id
         uoId,t.business_key,t.business_key businessKey,t.remark,t.status_cd,t.status_cd statusCd,t.coupon_id,t.coupon_id
-        couponId,t.community_id,t.community_id communityId,cpu.user_name userName,cpu.tel,cpu.value
+        couponId,t.community_id,t.community_id communityId,cpu.user_name userName,cpu.tel,cpu.value,t.create_time createTime
         from coupon_property_user_detail t
         left join coupon_property_user cpu on t.coupon_id = cpu.coupon_id and cpu.status_cd = '0'
         where 1 =1

service-acct/src/main/java/com/java110/acct/cmd/couponProperty/WriteOffCouponPropertyUserCmd.java

@@ -80,6 +80,10 @@ public class WriteOffCouponPropertyUserCmd extends Cmd {
 
         String couponId = CommonCache.getAndRemoveValue(reqJson.getString("couponQrcode"));
 
+        if(StringUtil.isEmpty(couponId)){
+            throw new CmdException("优惠券不存在");
+        }
+
         reqJson.put("couponId", couponId);
 
         CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
@@ -158,7 +162,11 @@ public class WriteOffCouponPropertyUserCmd extends Cmd {
         couponPropertyUserDetailPo.setCouponName(couponPropertyUserDtos.get(0).getCouponName());
         couponPropertyUserDetailPo.setUoId(GenerateCodeFactory.getGeneratorId("11"));
         couponPropertyUserDetailPo.setDetailType(couponPropertyUserDtos.get(0).getToType());
-        couponPropertyUserDetailPo.setRemark(remark + reqJson.getString("remark"));
+        if(reqJson.containsKey("remark")) {
+            couponPropertyUserDetailPo.setRemark(remark + reqJson.getString("remark"));
+        }else{
+            couponPropertyUserDetailPo.setRemark(remark);
+        }
         flag = couponPropertyUserDetailV1InnerServiceSMOImpl.saveCouponPropertyUserDetail(couponPropertyUserDetailPo);
         if (flag < 1) {
             throw new CmdException("赠送失败");
@@ -177,7 +185,7 @@ public class WriteOffCouponPropertyUserCmd extends Cmd {
             return "接口核销";
         }
 
-        return userDtos.get(0).getUserName() + "-" + userDtos.get(0).getTel() + "核销";
+        return userDtos.get(0).getName() + "-" + userDtos.get(0).getTel() + "核销";
 
     }
 }