签到付款

ch-core/src/main/java/com/wwdz/ch/core/api/wxpay/WxPayServiceApi.java

@@ -87,6 +87,7 @@ public class WxPayServiceApi {
             String prepayStr = response.getPackageVal();
             if (StringUtils.hasLength(prepayStr)) {
                 String prepayId = prepayStr.split("=")[1];
+                logger.info("订单号: {}, 预支付prepayId = {}", dto.getDistributionOrderId(), prepayId);
                 return Result.success(prepayId);
             }
         } catch (HttpException e) { // 发送HTTP请求失败

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/DistributionOrderVo.java

@@ -214,5 +214,10 @@ public class DistributionOrderVo implements Entity {
      * 团购相关信息
      */
     private GroupPurchaseInfo groupPurchaseInfo;
+
+    /**
+     * 运费
+     */
+    private String logisticsAmount;
 }
 

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

@@ -228,6 +228,7 @@ public class UserSigninServiceImpl implements UserSigninService {
             distributionOrder.setDistributionOrderId(distributionOrderId);
             distributionOrder.setBuyerId(dto.getUserId());
             distributionOrder.setBuyerOpenid(dto.getUserOpenId());
+            distributionOrder.setPrepayId(prepayId);
             distributionOrder.setShopId(CommConsts.SYSTEM_ACCOUNT.longValue());
             distributionOrder.setSellerId(CommConsts.SYSTEM_ACCOUNT.longValue());
             distributionOrder.setAmount(orderAmount);

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

@@ -1099,7 +1099,12 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setItemName(supplierItem.getName());
                 long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
                 distributionOrderVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
-                distributionOrderVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
+                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GIFT.getCode()) {
+                    distributionOrderVo.setItemPrice("0");
+                    distributionOrderVo.setLogisticsAmount("10");
+                } else {
+                    distributionOrderVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
+                }
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
@@ -1113,7 +1118,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     distributionOrderVo.setGroupPurchaseInfo(result.getData());
                 }
                 Date date = distributionOrder.getCreateTime();
-                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()
+                 || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GIFT.getCode()) {
                     Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                     Date time = Date.from(instant);
                     distributionOrderVo.setPayEndTime(time);
@@ -1205,7 +1211,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
-            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()
+            || type == DistributionEnum.DistributionTypeEnum.GIFT.getCode()) {
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);