wuxw лет назад: 3
Родитель
Сommit
b5a07bb0ba

+ 4 - 0
java110-bean/src/main/java/com/java110/dto/couponPropertyUser/CouponPropertyUserDto.java

@@ -18,6 +18,10 @@ public class CouponPropertyUserDto extends PageDto implements Serializable {
     public static final String STATE_WAIT = "1001";
     public static final String STATE_WAIT = "1001";
     public static final String STATE_FINISH = "2002";
     public static final String STATE_FINISH = "2002";
     public static final String TO_TYPE_PARKING = "4004"; //停车券
     public static final String TO_TYPE_PARKING = "4004"; //停车券
+    public static final String TO_TYPE_BUY = "1001"; //购物券
+    public static final String TO_TYPE_BUY_INNER = "1011"; //购物券
+    public static final String TO_TYPE_BUY_REPAIR = "3003"; //维修券
+
 
 
     private String couponName;
     private String couponName;
     private String toType;
     private String toType;

+ 23 - 4
service-acct/src/main/java/com/java110/acct/cmd/couponProperty/CouponPropertyUserGiftCarCmd.java

@@ -10,13 +10,13 @@ import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.doc.annotation.*;
 import com.java110.doc.annotation.*;
 import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto;
 import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto;
 import com.java110.dto.couponPropertyUser.CouponPropertyUserDto;
 import com.java110.dto.couponPropertyUser.CouponPropertyUserDto;
+import com.java110.dto.couponPropertyUserDetail.CouponPropertyUserDetailDto;
 import com.java110.dto.parkingCouponCar.ParkingCouponCarDto;
 import com.java110.dto.parkingCouponCar.ParkingCouponCarDto;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.user.UserDto;
-import com.java110.intf.acct.ICouponPropertyPoolConfigV1InnerServiceSMO;
-import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO;
-import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO;
+import com.java110.intf.acct.*;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
 import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
+import com.java110.po.couponPropertyUserDetail.CouponPropertyUserDetailPo;
 import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
 import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.lock.DistributedLock;
 import com.java110.utils.lock.DistributedLock;
@@ -71,6 +71,9 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
     @Autowired
     @Autowired
     private IParkingCouponCarV1InnerServiceSMO parkingCouponCarV1InnerServiceSMOImpl;
     private IParkingCouponCarV1InnerServiceSMO parkingCouponCarV1InnerServiceSMOImpl;
 
 
+    @Autowired
+    private ICouponPropertyUserDetailV1InnerServiceSMO couponPropertyUserDetailV1InnerServiceSMOImpl;
+
     @Autowired
     @Autowired
     private ICouponPropertyPoolConfigV1InnerServiceSMO couponPropertyPoolConfigV1InnerServiceSMOImpl;
     private ICouponPropertyPoolConfigV1InnerServiceSMO couponPropertyPoolConfigV1InnerServiceSMOImpl;
 
 
@@ -176,6 +179,22 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
             DistributedLock.releaseDistributedLock(requestId, key);
             DistributedLock.releaseDistributedLock(requestId, key);
         }
         }
 
 
+        //保存核销记录
+        String pccId = GenerateCodeFactory.getGeneratorId("11");
+
+        CouponPropertyUserDetailPo couponPropertyUserDetailPo = new CouponPropertyUserDetailPo();
+        couponPropertyUserDetailPo.setBusinessKey(pccId);
+        couponPropertyUserDetailPo.setCommunityId(reqJson.getString("communityId"));
+        couponPropertyUserDetailPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
+        couponPropertyUserDetailPo.setCouponName(couponPropertyUserDtos.get(0).getCouponName());
+        couponPropertyUserDetailPo.setUoId(GenerateCodeFactory.getGeneratorId("11"));
+        couponPropertyUserDetailPo.setDetailType(couponPropertyUserDtos.get(0).getToType());
+        couponPropertyUserDetailPo.setRemark("赠送"+reqJson.getString("carNum")+"停车券");
+        flag = couponPropertyUserDetailV1InnerServiceSMOImpl.saveCouponPropertyUserDetail(couponPropertyUserDetailPo);
+        if (flag < 1) {
+            throw new CmdException("赠送失败");
+        }
+
         CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
         CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
         couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
         couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
         couponPropertyPoolConfigDto.setColumnKey("hours");
         couponPropertyPoolConfigDto.setColumnKey("hours");
@@ -187,7 +206,7 @@ public class CouponPropertyUserGiftCarCmd extends Cmd {
         value = Math.ceil(value);
         value = Math.ceil(value);
 
 
         ParkingCouponCarPo parkingCouponCarPo = new ParkingCouponCarPo();
         ParkingCouponCarPo parkingCouponCarPo = new ParkingCouponCarPo();
-        parkingCouponCarPo.setPccId(GenerateCodeFactory.getGeneratorId("11"));
+        parkingCouponCarPo.setPccId(pccId);
         parkingCouponCarPo.setCouponId(reqJson.getString("couponId"));
         parkingCouponCarPo.setCouponId(reqJson.getString("couponId"));
         parkingCouponCarPo.setCouponShopId(reqJson.getString("couponId"));
         parkingCouponCarPo.setCouponShopId(reqJson.getString("couponId"));
         parkingCouponCarPo.setCommunityId(reqJson.getString("communityId"));
         parkingCouponCarPo.setCommunityId(reqJson.getString("communityId"));

Разница между файлами не показана из-за своего большого размера
+ 183 - 0
service-acct/src/main/java/com/java110/acct/cmd/couponProperty/WriteOffCouponPropertyUserCmd.java