玩物app跳转到换藏专场,专场id传-1

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysGroupPurchaseServiceImpl.java

@@ -50,9 +50,9 @@ public class SysGroupPurchaseServiceImpl implements SysGroupPurchaseService {
             for (String id : idList) {
                 long itemId = Long.valueOf(id);
                 SupplierItem oldItem = supplierItemDao.findById(itemId);
-                /*if (supplierItemDao.isSupplierIdExisted(itemId)) {
-                    continue;
-                }*/
+                if (supplierItemDao.isSupplierIdExisted(itemId, DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode())) {
+                    return Result.failed("商品id:" + itemId + ", 已转过团购");
+                }
                 //复制一份藏家藏品的数据，设置为团购品
                 SupplierItem supplierItem = new SupplierItem();
                 EntityMapper.copyAttribute(oldItem, supplierItem);

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -173,7 +173,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 supplierItemVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(supplierItem.getType()));
                 supplierItemVo.setCreatorName(supplierItem.getCreatorId() == CommConsts.SYSTEM_ACCOUNT.longValue()? "平台自营":cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
                 supplierItemVo.setStatusName(SupplierItemEnum.StatusEnum.getNameByCode(supplierItem.getStatus()));
-                if (supplierItemDao.isSupplierIdExisted(supplierItem.getId())) {
+                if (supplierItemDao.isSupplierIdExisted(supplierItem.getId(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode())) {
                     supplierItemVo.setIsTransformAuction(true);
                 } else {
                     supplierItemVo.setIsTransformAuction(false);
@@ -347,7 +347,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             if (supplierItem.getBuyLimitNum() == -1) {
                 supplierItemVo.setIsLimitBuy(false);
             }
-            if (supplierItemDao.isSupplierIdExisted(itemId)) {
+            if (supplierItemDao.isSupplierIdExisted(itemId, DistributionEnum.DistributionTypeEnum.AUCTION.getCode())) {
                 supplierItemVo.setIsTransformAuction(true);
             } else {
                 supplierItemVo.setIsTransformAuction(false);
@@ -564,8 +564,8 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             for (String id : idList) {
                 long itemId = Long.valueOf(id);
                 SupplierItem oldItem = supplierItemDao.findById(itemId);
-                if (supplierItemDao.isSupplierIdExisted(itemId)) {
-                    continue;
+                if (supplierItemDao.isSupplierIdExisted(itemId, DistributionEnum.DistributionTypeEnum.AUCTION.getCode())) {
+                    return Result.failed("商品id:" + itemId + ", 已转过拍卖");
                 }
                 //复制一份藏家藏品的数据，设置为拍卖品
                 SupplierItem supplierItem = new SupplierItem();

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/SupplierItemDao.java

@@ -97,6 +97,6 @@ public interface SupplierItemDao {
      * @param supplierId
      * @return
      */
-    boolean isSupplierIdExisted(long supplierId);
+    boolean isSupplierIdExisted(long supplierId, int type);
 
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -210,10 +210,11 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
 
 
     @Override
-    public boolean isSupplierIdExisted(long supplierId) {
+    public boolean isSupplierIdExisted(long supplierId, int type) {
         SupplierItemExample supplierItemExample = new SupplierItemExample();
         SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
         criteria.andSupplierIdEqualTo(supplierId);
+        criteria.andTypeEqualTo(type);
         criteria.andIsDeletedEqualTo(false);
         return supplierItemMapper.countByExample(supplierItemExample) > 0;
     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/GroupPurchaseServiceImpl.java

@@ -328,18 +328,6 @@ public class GroupPurchaseServiceImpl implements GroupPurchaseService {
         return Result.failed("查询团购进度失败");
     }
 
-/*
-    @Override
-    public Result payBalance(GroupPurchaseRecordRequestDto dto) {
-        try {
-
-        } catch (Exception e) {
-            logger.error("支付尾款失败 error : {}", e);
-        }
-        return Result.failed("支付尾款失败");
-    }*/
-
-
 
     @Override
     public Result systemAddRecord(GroupPurchaseRecordRequestDto dto) {
@@ -356,12 +344,15 @@ public class GroupPurchaseServiceImpl implements GroupPurchaseService {
             groupPurchaseRecord.setDepositPayId(depositPayId);
             groupPurchaseRecord.setDistributionOrderId(depositPayId);
             groupPurchaseRecord.setPrepayId(depositPayId);
+            groupPurchaseRecord.setTransactionId(depositPayId);
             groupPurchaseRecord.setItemId(dto.getItemId());
             groupPurchaseRecord.setItemNum(dto.getItemNum());
-            groupPurchaseRecord.setUserId(CommConsts.SYSTEM_ACCOUNT);
+            groupPurchaseRecord.setUserId(dto.getUserId() == null ? CommConsts.SYSTEM_ACCOUNT : dto.getUserId());
             groupPurchaseRecord.setUserOpenid(CommConsts.SYSTEM_ACCOUNT.toString());
             groupPurchaseRecord.setAmount(groupPurchaseConfig.getPrice());
             groupPurchaseRecord.setState(GroupPurchaseEnum.StateEnum.VALID.getCode());
+            groupPurchaseRecord.setCreateTime(new Date());
+            groupPurchaseRecord.setUpdateTime(new Date());
             groupPurchaseRecordDao.insert(groupPurchaseRecord);
             return Result.success();
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SpecialPerformanceServiceImpl.java

@@ -310,6 +310,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 if (!CollectionUtils.isEmpty(specialPerformanceList)) {
                     specialPerformance = specialPerformanceList.get(0);
                     dto.setSpecialPerformanceId(specialPerformance.getId());
+                    specialPerformanceId = specialPerformance.getId();
                 } else {
                     return Result.failed(8000, "没有专场");
                 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/GroupPurchaseController.java

@@ -51,4 +51,12 @@ public class GroupPurchaseController {
         }
         return groupPurchaseService.cancelOrder(dto);
     }
+
+
+    @ApiOperation(value = "系统新增团购记录")
+    @PostMapping("/systemAddRecord")
+    public Result systemAddRecord(@RequestBody GroupPurchaseRecordRequestDto dto) {
+        logger.info("系统新增团购记录,请求参数:{}", JSON.toJSONString(dto));
+        return groupPurchaseService.systemAddRecord(dto);
+    }
 }

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -89,12 +89,12 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2408051714332074170");
+        List<String> list = Arrays.asList("DA2408061745277070223");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);
-            dto.setAmount("1");
-            dto.setRefundPrice("1");
+            dto.setAmount("0.1");
+            dto.setRefundPrice("0.1");
             Result result = wxPayServiceApi.refund(dto);
             logger.info("申请微信支付退款:{}", result);
         });