订单全流程 （差拼团失败）

mall-service/src/main/java/com/txz/mall/business/PinkServiceBusiness.java

@@ -18,16 +18,9 @@ public interface PinkServiceBusiness {
      */
     List<StorePinkDetailVO> getAdminList(Integer pinkId);
 
-    /**
-     * 检查状态，更新数据
-     */
-    void detectionStatus();
-
     /**
      * 拼团失败----到点自动退回余额
      */
-    void pinkFail(Long id);
-
-
+    void pinkFail();
 
 }

mall-service/src/main/java/com/txz/mall/business/impl/OrderServiceBusinessImpl.java

@@ -45,7 +45,7 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
         List<StoreOrderInfo> infoList = storeOrderInfoService.findByCondition(infoCondition);
         List<StoreOrderStatus> logList = storeOrderStatusService.getLogList(storeOrder.getId());
         UserDTO user = userDubboServiceClient.getUser(storeOrder.getUid());
-        UserAddress userAddress = userAddressService.getDefaultByUid(storeOrder.getUid());
+        UserAddress userAddress = userAddressService.findById(storeOrder.getAddressId());
         StoreOrderVO vo = new StoreOrderVO();
         BeanUtils.copyProperties(storeOrder, vo);
         vo.setOrderInfoVO(infoList);

mall-service/src/main/java/com/txz/mall/business/impl/PinkServiceBusinessImpl.java

@@ -70,7 +70,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void detectionStatus() {
+    public void pinkFail() {
         // 查找所有结束时间小等于当前的进行中拼团团长
         Condition condition = new Condition(StorePink.class);
         Example.Criteria criteria = condition.createCriteria();
@@ -82,10 +82,14 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
         if (CollUtil.isEmpty(headList)) {
             return;
         }
+        // 全部改失败
+
+
+
+
         /**
          * 1.判断是否拼团成功
-         * 2.成功的修改状态
-         * 3.失败的拼团改为失败，订单申请退款
+         * 2.失败的拼团改为失败，订单申请退款
          */
         List<StorePink> pinkSuccessList = CollUtil.newArrayList();
         List<StorePink> pinkFailList = CollUtil.newArrayList();
@@ -99,19 +103,6 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
                 pinkSuccessList.addAll(memberList);
                 continue;
             }
-            // 计算虚拟比例，判断是否拼团成功
-//            StoreCombination storeCombination = storeCombinationService.findById(headPink.getCid());
-//            // 虚拟成团比例
-//            Integer virtual = storeCombination.getVirtualRation();
-//            if (headPink.getPeople() <= memberList.size() + virtual) {
-//                // 可以虚拟成团
-//                memberList.forEach(i -> {
-//                    i.setStatus(2);
-//                    i.setIsVirtual(1);
-//                });
-//                pinkSuccessList.addAll(memberList);
-//                continue;
-//            }
             // 失败
             headPink.setStatus(3);
             // 订单申请退款
@@ -159,27 +150,8 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
 //                    StoreOrder storeOrder = storeOrderService.getByOderId(i.getOrderId());
 //                    StoreCombination storeCombination = storeCombinationService.getById(i.getCid());
 //                    User tempUser = userService.getById(i.getUid());
-//                    // 发送微信模板消息
 //                });
 //            }
         }
     }
-
-
-    @Override
-    public void pinkFail(Long id) {
-        StorePink userPink = storePinkService.findById(id);
-//        // 订单申请退款
-//        OrderRefundApplyRequest refundRequest = new OrderRefundApplyRequest();
-//        refundRequest.setId(order.getId());
-//        refundRequest.setUni(order.getOrderId());
-//        refundRequest.setText("拼团订单取消，申请退款");
-//        refundRequest.setExplain("用户取消拼团订单，申请退款");
-//        boolean apply = orderService.refundApply(refundRequest);
-//        if (!apply) throw new CrmebException("订单申请退款失败");
-//
-//        // 拼团改为未完成
-//        userPink.setStatus(3).setStopTime(System.currentTimeMillis());
-//        storePinkService.updateById(userPink);
-    }
 }

mall-service/src/main/java/com/txz/mall/controller/PinkController.java

@@ -164,8 +164,8 @@ public class PinkController {
      */
     @ApiOperation(value = "拼团失败")
     @PostMapping(value = "/pinkFail")
-    public Result pinkFail(@RequestParam("id") Long id) {
-        pinkServiceBusiness.pinkFail(id);
+    public Result pinkFail() {
+        pinkServiceBusiness.pinkFail();
         return Result.success();
     }
 

mall-service/src/main/java/com/txz/mall/controller/UserAddressController.java

@@ -54,6 +54,7 @@ public class UserAddressController {
 //                storeOrder.setUserPhone(userAddress.getPhone());
                 String userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
                 storeOrder.setUserAddress(userAddressStr);
+                storeOrder.setAddressId(userAddress.getId());
                 storeOrderService.update(storeOrder);
             }
         } catch (Exception e) {

mall-service/src/main/java/com/txz/mall/core/RedisUtil.java

@@ -1,5 +1,6 @@
 package com.txz.mall.core;
 
+import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -355,6 +356,19 @@ public class RedisUtil {
         	return 0;
         }
     }
+
+	/**
+	 * 列表添加左边添加
+	 *
+	 * @param k string key
+	 * @param v Object v
+	 * @author Mr.Zhang
+	 * @since 2020-04-13
+	 */
+	public void lPush(String k, Object v) {
+		ListOperations<String, Object> list = redisTemplate.opsForList();
+		list.leftPush(k, v);
+	}
 	
 	/**
 	 * 获取set缓存的长度

mall-service/src/main/java/com/txz/mall/dubbo/client/CifAccountDubboServiceClient.java

@@ -14,6 +14,16 @@ public class CifAccountDubboServiceClient {
     @Reference
     private AccountDubboService accountDubboService;
 
+    /**
+     * 获取用户钱包账户
+     *
+     * @param userId
+     * @return
+     */
+    public Result getWalletAccount(Long userId) {
+        return accountDubboService.getWalletAccount(userId);
+    }
+
     /**
      * 充值
      *

mall-service/src/main/java/com/txz/mall/model/StoreOrder.java

@@ -51,6 +51,10 @@ public class StoreOrder {
     @ApiModelProperty(value = "详细地址")
     private String userAddress;
 
+    @Column(name = "address_id")
+    @ApiModelProperty(value = "地址id")
+    private Long addressId;
+
     /**
      * 运费金额
      */

mall-service/src/main/java/com/txz/mall/model/StorePink.java

@@ -96,7 +96,7 @@ public class StorePink {
     @Column(name = "k_id")
     private Long kId;
 
-    @ApiModelProperty(value = "幸运儿 默认0  1为幸运儿 (团长不能是天选)")
+    @ApiModelProperty(value = "幸运儿 默认0  1为幸运儿   (//团长不能是天选)")
     @Column(name = "l_id")
     private Integer lId;
 

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -7,10 +7,15 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.txz.cif.dto.AccountDTO;
+import com.txz.cif.dto.Result;
 import com.txz.cif.dto.UserDTO;
+import com.txz.cif.param.JoinParam;
+import com.txz.cif.param.OpenParam;
 import com.txz.mall.constants.Constants;
 import com.txz.mall.core.AbstractService;
 import com.txz.mall.core.RedisUtil;
+import com.txz.mall.core.ResultCode;
 import com.txz.mall.core.ServiceException;
 import com.txz.mall.dubbo.client.CifAccountDubboServiceClient;
 import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
@@ -1078,7 +1083,15 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 校验收货信息
         String verifyCode = "";
         String userAddressStr = "";
-
+        if (request.getAddressId() != null) {
+            if (request.getAddressId() <= 0) {
+                throw new ServiceException("请选择收货地址");
+            }
+            UserAddress userAddress = userAddressService.findById(request.getAddressId());
+            if (ObjectUtil.isNull(userAddress) || userAddress.getIsDelete().equals(1)) {
+                throw new ServiceException("收货地址有误");
+            }
+        }
 //        UserAddress userAddress = userAddressService.getDefaultByUid(user.getId());
 //        if (userAddress != null) {
 //            request.setRealName(userAddress.getRealName());
@@ -1137,6 +1150,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         storeOrder.setOrderId(orderNo);
         storeOrder.setRealName(user.getName());
         storeOrder.setUserPhone(user.getPhoneNo());
+        storeOrder.setAddressId(request.getAddressId());
         storeOrder.setUserAddress(userAddressStr);
         storeOrder.setTotalNum(orderInfoVo.getOrderProNum());
         storeOrder.setCouponId(Optional.ofNullable(request.getCouponId()).orElse(0L));
@@ -1223,8 +1237,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         }
 
         // 加入自动未支付自动取消队列
-//        redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId());
-//
+        redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId());
         MyRecord record = new MyRecord();
         record.set("orderId", storeOrder.getId());
         record.set("orderNo", orderNo);
@@ -1237,26 +1250,35 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         StoreOrder storeOrder = findBy("orderId", dto.getOrderId());
 
         // 检验余额够不够
+        Result result = accountDubboServiceClient.getWalletAccount(storeOrder.getUid());
+        if (result.getCode().equals(ResultCode.SUCCESS)) {
+            AccountDTO accountDTO = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), AccountDTO.class);
+            if (accountDTO.getBalance().compareTo(storeOrder.getPayPrice()) < 0) {
+                throw new ServiceException(ResultCode.INSUFFICIENT_BALANCE);
+            }
+        } else {
+            throw new ServiceException("获取用户钱包账户失败");
+        }
         storeOrder.setPaid(1);
         update(storeOrder);
         if ("open".equals(dto.getType())) {
-//            OpenParam openParam = new OpenParam();
-//            openParam.setBizId(storeOrder.getId().toString());
-//            openParam.setBizNo(storeOrder.getOrderId());
-//            openParam.setUserId(storeOrder.getUid());
-//            openParam.setAmount(storeOrder.getPayPrice());
-//            openParam.setTransTime(new Date());
-//            accountDubboServiceClient.openGroup(openParam);
+            OpenParam openParam = new OpenParam();
+            openParam.setBizId(storeOrder.getId().toString());
+            openParam.setBizNo(storeOrder.getOrderId());
+            openParam.setUserId(storeOrder.getUid());
+            openParam.setAmount(storeOrder.getPayPrice());
+            openParam.setTransTime(new Date());
+            accountDubboServiceClient.openGroup(openParam);
             goOpen(dto.getOrderId());
         }
         if ("join".equals(dto.getType())) {
-//            JoinParam joinParam = new JoinParam();
-//            joinParam.setBizId(storeOrder.getId().toString());
-//            joinParam.setBizNo(storeOrder.getOrderId());
-//            joinParam.setUserId(storeOrder.getUid());
-//            joinParam.setAmount(storeOrder.getPayPrice());
-//            joinParam.setTransTime(new Date());
-//            accountDubboServiceClient.joinGroup(joinParam);
+            JoinParam joinParam = new JoinParam();
+            joinParam.setBizId(storeOrder.getId().toString());
+            joinParam.setBizNo(storeOrder.getOrderId());
+            joinParam.setUserId(storeOrder.getUid());
+            joinParam.setAmount(storeOrder.getPayPrice());
+            joinParam.setTransTime(new Date());
+            accountDubboServiceClient.joinGroup(joinParam);
             goPink(dto);
         }
         return true;

mall-service/src/main/java/com/txz/mall/service/impl/StorePinkServiceImpl.java

@@ -3,9 +3,11 @@ package com.txz.mall.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.txz.cif.param.AccomplishParam;
 import com.txz.mall.core.AbstractService;
 import com.txz.mall.core.ServiceException;
 import com.txz.mall.dao.StorePinkMapper;
+import com.txz.mall.dubbo.client.CifAccountDubboServiceClient;
 import com.txz.mall.model.StorePink;
 import com.txz.mall.service.StorePinkService;
 import com.txz.mall.util.RandomUtil;
@@ -29,6 +31,9 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
     @Resource
     private StorePinkMapper storePinkMapper;
 
+    @Resource
+    private CifAccountDubboServiceClient accountDubboServiceClient;
+
     @Override
     public List<StorePink> getListByCidAndKid(Long cid, Long kid) {
         Condition condition = new Condition(StorePink.class);
@@ -43,6 +48,7 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
 
     @Override
     public void pinkSuccess(Long id) {
+        Date date = new Date();
         if (ObjectUtil.isNull(id)) {
             return;
         }
@@ -51,11 +57,27 @@ public class StorePinkServiceImpl extends AbstractService<StorePink> implements
         memberList.add(teamPink);
         memberList.forEach(i -> {
             i.setStatus(2);
-            i.setStopTime(new Date());
+            i.setStopTime(date);
             update(i);
         });
 
+        // 算出天选
         theSelection(teamPink.getOrderId());
+
+        Condition condition = new Condition(StorePink.class);
+        Example.Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("isDelete", 0);
+        criteria.andEqualTo("orderId", teamPink.getOrderId());
+        criteria.andEqualTo("lId", 0);
+        List<StorePink> pinkList = findByCondition(condition);
+
+        AccomplishParam param = new AccomplishParam();
+        param.setBizNo(teamPink.getOrderId());
+        param.setBizId(teamPink.getId().toString());
+        param.setUserIds(pinkList.stream().map(StorePink::getUid).collect(Collectors.toList()));
+        param.setAmount(teamPink.getPrice());
+        param.setTransTime(date);
+        accountDubboServiceClient.accomplishGroup(param);
     }
 
     @Override

mall-service/src/main/resources/mapper/StoreOrderMapper.xml

@@ -11,6 +11,7 @@
         <result column="real_name" jdbcType="VARCHAR" property="realName"/>
         <result column="user_phone" jdbcType="VARCHAR" property="userPhone"/>
         <result column="user_address" jdbcType="VARCHAR" property="userAddress"/>
+        <result column="address_id" jdbcType="BIGINT" property="addressId"/>
         <result column="freight_price" jdbcType="DECIMAL" property="freightPrice"/>
         <result column="total_num" jdbcType="INTEGER" property="totalNum"/>
         <result column="total_price" jdbcType="DECIMAL" property="totalPrice"/>