联合丽格1.0.1

src/main/java/com/caimei/modules/club/dao/CmOperationUserDao.java

@@ -103,6 +103,14 @@ public interface CmOperationUserDao {
      */
     void updateProcure(CmOrganizeProcure cmOrganizeProcure);
 
+    /**
+     * 修改用户信息
+     * @param mobile
+     * @param userName
+     * @param userId
+     */
+    void updateUserData(@Param("mobile") String mobile, @Param("userName") String userName, @Param("userId") Integer userId);
+
     /**
      * 修改用户协销Id
      * @param serviceProviderId

src/main/java/com/caimei/modules/club/service/impl/CmOperationUserServiceImpl.java

@@ -231,7 +231,10 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
         } else {
             // 修改采购员信息
             cmOrganizeProcure.setValidFlag(1);
+            cmOrganizeProcure.setLinkMan(cmOrganizeProcure.getName());
             cmOperationUserDao.updateProcure(cmOrganizeProcure);
+            // 修改用户信息
+            cmOperationUserDao.updateUserData(cmOrganizeProcure.getMobile(), cmOrganizeProcure.getName(), cmOrganizeProcure.getUserId());
             // 修改绑定机构
             ArrayList<Integer> arrayList = new ArrayList<>();
             // 采购员绑定机构

src/main/java/com/caimei/modules/groupbuy/service/ProcureService.java

@@ -157,7 +157,9 @@ public class ProcureService {
             String format = dateFormat.format(new Date(p.getSaveTime()));
             buyerDto.setSaveTime(format);
             int count = (int) mongoTemplate.count(Query.query(Criteria.where("procureId").is(p.getId())), AdditionalPo.class);
+            log.info("p.getUserId()======"+p.getUserId());
             CmUser linkMan = userDao.findLinkMan(p.getUserId());
+            log.info("linkMan======"+linkMan);
             buyerDto.setLinkMan(linkMan.getLinkMan());
             buyerDto.setMobile(linkMan.getMobile());
             buyerDto.setClubCount(count);

src/main/java/com/caimei/modules/order/service/impl/NewOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.caimei.utils.AppUtils;
 import com.caimei.utils.NewOrderStatus;
 import com.caimei.utils.ResponseJson;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 public class NewOrderServiceImpl implements NewOrderService {
 
     @Resource
@@ -68,9 +70,9 @@ public class NewOrderServiceImpl implements NewOrderService {
             AtomicReference<Double> totalAddedValueTax = new AtomicReference<>(0D);
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
+                    orderUtil.setShopOrderStatus(shopOrder);
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderId(shopOrder.getShopOrderId());
                     list.addAll(pList);
-                    shopOrder.setNewOrderProducts(pList);
                     if (pList.stream().anyMatch(p -> p.getProductId() == 999)) {
                         shopOrder.setPostFeeCos("1");
                     }
@@ -82,7 +84,7 @@ public class NewOrderServiceImpl implements NewOrderService {
                             item.setReturnedNum(returnedNum);
                         }
                         /**确认收货信息*/
-                        if (NewOrderStatus.hasReceived(newOrder.getStatus())) {
+                        if (NewOrderStatus.hasReceived(shopOrder.getShopStatus())) {
                             Integer receivedNum = newOrderProductDao.getReceivedNum(item.getOrderProductId());
                             item.setReceivedNum(receivedNum);
                         }
@@ -94,6 +96,7 @@ public class NewOrderServiceImpl implements NewOrderService {
                     });
                     Double payed = cmPayShopRecordDao.sumByShopOrderId(shopOrder.getShopOrderId());
                     shopOrder.setPayed(payed);
+                    shopOrder.setNewOrderProducts(pList);
                 }
                 newOrder.setNewShopOrders(shopOrders);
             }

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -48,6 +48,8 @@ public class OrderUtils {
     @Resource
     private CmReturnedPurchaseDao returnDao;
     @Resource
+    private NewOrderProductDao newOrderProductDao;
+    @Resource
     private CmDiscernReceiptDao receiptDao;
     @Resource
     private  NewOrderService newOrderService;
@@ -60,12 +62,12 @@ public class OrderUtils {
      * @param shopOrder
      */
     public NewShopOrder getShouldPay(NewShopOrder shopOrder) {
+        setShopOrderStatus(shopOrder);
         List<NewOrderProduct> products = payShopDao.findPayOrderProducts(shopOrder.getShopOrderId());
         shopOrder.setShopOrderNos(payShopDao.findShopOrderNos(shopOrder.getOrderId()));
         AtomicReference<BigDecimal> organizeFee = new AtomicReference<>();
         AtomicReference<BigDecimal> shopFee = new AtomicReference<>();
         AtomicReference<BigDecimal> totalAmount = new AtomicReference<>();
-        shopOrder.setNewOrderProducts(products);
         products.forEach(p -> {
             // 商品总价 * 供应商成本比例 - 手续费 = 应付供应商
             shopFee.set(MathUtil.add(MathUtil.mul(p.getTotalAmount(), MathUtil.div(p.getShopPercent(), 100), 2), shopFee.get()));
@@ -73,7 +75,15 @@ public class OrderUtils {
             organizeFee.set(MathUtil.add(MathUtil.mul(p.getTotalAmount(), MathUtil.div(p.getOrganizePercent(), 100), 2), organizeFee.get()));
             // 商品总价
             totalAmount.set(MathUtil.add(p.getTotalAmount(), totalAmount.get()));
+            /**
+             * 确认收货信息
+             */
+            if (NewOrderStatus.hasReceived(shopOrder.getShopStatus())) {
+                Integer receivedNum = newOrderProductDao.getReceivedNum(p.getOrderProductId());
+                p.setReceivedNum(receivedNum);
+            }
         });
+        shopOrder.setNewOrderProducts(products);
         // 子订单总额 - 付供应商成本 - 付组织 = 应付采美
         Double cmFee = MathUtil.sub(totalAmount.get(), MathUtil.add(shopFee.get(), organizeFee.get())).doubleValue();
 
@@ -473,6 +483,42 @@ public class OrderUtils {
         }
     }
 
+    /**
+     * 设置子订单状态
+     * shopStatus  0：待确认 1：已确认 2：交易完成 3：订单完成 4：已关闭 5：交易全退
+     *
+     * payStatus (付款供应商)付款状态：1待付款、2部分付款、3已付款
+     * sendOutStatus  发货状态：1待发货、2部分发货、3已发货
+     * receiptStatus 收款状态：1待收款、2部分收款、3已收款
+     */
+    public void setShopOrderStatus(NewShopOrder newShopOrder) {
+        // 11, 待付待收待发
+        if (("1".equals(newShopOrder.getShopStatus()) || "2".equals(newShopOrder.getShopStatus()) || "3".equals(newShopOrder.getShopStatus())) && "1".equals(newShopOrder.getOrderStatusFlag()) && "1".equals(newShopOrder.getRefundStatus())) {
+            if ( "1".equals(newShopOrder.getReceiptStatus()) && "1".equals( newShopOrder.getSendOutStatus())){
+                newShopOrder.setShopStatus("11");
+            } else if ( "1".equals( newShopOrder.getReceiptStatus()) && "2".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("12");
+            } else if ( "1".equals( newShopOrder.getReceiptStatus()) && "3".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("13");
+            } else if ( "2".equals( newShopOrder.getReceiptStatus()) && "1".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("21");
+            } else if ( "2".equals( newShopOrder.getReceiptStatus()) && "2".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("22");
+            } else if ( "2".equals( newShopOrder.getReceiptStatus()) && "3".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("23");
+            } else if ( "3".equals( newShopOrder.getReceiptStatus()) && "1".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("31");
+            } else if ( "3".equals( newShopOrder.getReceiptStatus()) && "2".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("32");
+            } else if ( "3".equals( newShopOrder.getReceiptStatus()) && "3".equals( newShopOrder.getSendOutStatus())) {
+                newShopOrder.setShopStatus("33");
+            }
+        }
+        if (!"1".equals(newShopOrder.getOrderStatusFlag()) || !"1".equals(newShopOrder.getRefundStatus())) {
+            newShopOrder.setShopStatus("5");
+        }
+    }
+
     /**
      * 设置收货人信息
      *

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -71,7 +71,7 @@
         LEFT JOIN cm_shop_order cso ON cso.shopOrderId = crr.orderId
         LEFT JOIN cm_order cr ON cr.orderId = cso.orderId
         LEFT JOIN club c ON cr.userId = c.userId
-        left join serviceprovider sp ON c.spID = sp.serviceProviderID
+        left join serviceprovider sp ON cr.spID = sp.serviceProviderID
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
             crr.relationType = 1

src/main/resources/mapper/CmOperationUserMapper.xml

@@ -282,10 +282,10 @@
         <where>
             (c.spId is null or c.spId = 1342) and u.userOrganizeID = #{userOrganizeId} and c.status = 90
             <if test="name != null and name != ''">
-                c.name like comcat('%',#{name},'%')
+                and c.name like concat('%',#{name},'%')
             </if>
             <if test="mobile != null and mobile != ''">
-                c.contractMobile like comcat('%',#{mobile},'%')
+                and c.contractMobile like concat('%',#{mobile},'%')
             </if>
         </where>
         order by c.addTime desc
@@ -397,6 +397,12 @@
            status = #{status}
         WHERE serviceProviderID = #{serviceProviderId}
     </update>
+    <update id="updateUserData">
+        update user
+        set bindMobile = #{mobile},
+            userName = #{userName}
+        where userId = #{userId}
+    </update>
     <update id="updateUserSpId">
         update user
         set serviceProviderID = #{serviceProviderId}

src/main/resources/mapper/NewOrderMapper.xml

@@ -305,7 +305,7 @@
         LEFT JOIN bp_order_userinfo bou ON bou.orderId = co.orderId
         left join cm_order_product cop on co.orderId = cop.orderId
         left join club c on co.userId = c.userId
-        LEFT JOIN serviceprovider sp ON c.spID = sp.serviceProviderID
+        LEFT JOIN serviceprovider sp ON co.spID = sp.serviceProviderID
         <where>
              co.organizeId = #{organizeId}
 
@@ -443,7 +443,7 @@
             END) AS spName
         FROM cm_order a
         left join club c on a.userId = c.userId
-        LEFT JOIN serviceprovider sp ON c.spID = sp.serviceProviderID
+        LEFT JOIN serviceprovider sp ON a.spID = sp.serviceProviderID
         WHERE a.orderId = #{id}
     </select>