Merge remote-tracking branch 'origin/bly_store' into bly_store

fs-service/src/main/java/com/fs/his/domain/FsStoreOrder.java

@@ -265,5 +265,6 @@ public class FsStoreOrder extends BaseEntity
     private Integer source;
     private BigDecimal billPrice;
     private String erpPhone;
+    private Integer orderMedium; //媒体来源
 
 }

fs-service/src/main/java/com/fs/hisStore/config/StoreConfig.java

@@ -23,5 +23,5 @@ public class StoreConfig implements Serializable {
     private String refundAddress;
     private Integer auditSwitch; // 订单审核开关
     private Integer createSalesOrderType; // 订单改价方式 1 商品改价 2总价改价
-
+    private Integer orderAttribution; // 下单归属 1 多销售 2单销售
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCartScrm.java

@@ -60,5 +60,8 @@ public class FsStoreCartScrm extends BaseEntity
     @Excel(name = "改价(商品单价)")
     private BigDecimal changePrice;
 
+    /** 是否是赠品 */
+    @Excel(name = "是否是赠品 0:否 1:是")
+    private Integer isGift;
 
 }

fs-service/src/main/java/com/fs/hisStore/dto/FsStoreCartDTO.java

@@ -31,4 +31,5 @@ import java.math.BigDecimal;
 
     private BigDecimal brokerageThree;
 
+    private Integer isGift;
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsDoctorArticleScrmMapper.java

@@ -77,7 +77,8 @@ public interface FsDoctorArticleScrmMapper
             "            <if test=\"views != null \"> and ar.views = #{views}</if>\n" +
             "            <if test=\"status != null \"> and ar.status = #{status}</if>\n" +
             "        </where> "+
-            " ORDER BY ar.article_id desc"+
+//            " ORDER BY ar.article_id desc"+
+            " ORDER BY ar.create_time asc"+
             "</script>"})
 
     List<FsDoctorArticleListVO> selectFsDoctorArticleListVO(FsDoctorArticleScrm fsDoctorArticle);

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -92,4 +92,6 @@ public interface FsStoreCartScrmMapper
             "</if>" +
             "</script>"})
     Integer selectFsStoreCartCount(@Param("maps") FsStoreCartCountParam param);
+    @Select("select c.*,p.cate_id,p.product_name,p.image as product_image,p.temp_id,p.product_type,v.price,v.sku as product_attr_name,v.image as product_attr_image,v.stock,v.cost,v.integral,v.weight,v.volume,v.bar_code,v.group_bar_code,v.brokerage,v.brokerage_two,v.brokerage_three from fs_store_cart_scrm c left join fs_store_product_scrm p on p.product_id=c.product_id left join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id where c.is_gift = 1 AND user_id = #{userId}")
+    List<FsStoreCartQueryVO> selectFsStoreGiftCartList(@Param("userId") Long userId);
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreCartParam.java

@@ -28,5 +28,8 @@ public class FsStoreCartParam {
     @ApiModelProperty(value = "是否购买")
     private Integer isBuy=0;
 
+    @ApiModelProperty(value = "是否是赠品")
+    private Integer isGift;
+
 
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreConfirmOrderParam.java

@@ -11,6 +11,8 @@ public class FsStoreConfirmOrderParam {
     @NotBlank(message = "请提交购买的商品")
     @ApiModelProperty(value = "购物车ID 多个,分隔")
     private String cartIds;
+    @ApiModelProperty(value = "赠品购物车ID 多个,分隔")
+    private String giftCartIds;
     @NotBlank(message = "购买类型不能为空")
     @ApiModelProperty(value = "buy cart")
     private String type;

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderMoneyByProductParam.java

@@ -17,4 +17,6 @@ public class FsStoreOrderMoneyByProductParam {
 
     //购物车明细
     private List<FsStoreCartQueryVO> carts;
+
+    private List<FsStoreCartQueryVO> giftCarts;
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderScrmService.java

@@ -173,9 +173,9 @@ public interface IFsStoreOrderScrmService
 
     R addTuiMoney(FsStoreOrderAddTuiMoneyParam param);
 
-    R createSalesOrder(CompanyUser companyUser, String cateIds,Integer orderType,Integer orderMedium);
+    R createSalesOrder(CompanyUser companyUser, String cateIds,String giftCateIds,Integer orderType,Integer orderMedium);
 
-    R getSalesOrder(String createOrderKey);
+    R getSalesOrder(String createOrderKey,Long userId);
 
     R addUserCart(long userId, String createOrderKey);
 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreCartScrmServiceImpl.java

@@ -168,9 +168,14 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
             cartMap.setIsBuy(0);
             cartMap.setProductId(cartParam.getProductId());
             cartMap.setProductAttrValueId(cartParam.getAttrValueId());
+            if(cartParam.getIsGift()!= null && cartParam.getIsGift()==1){
+                cartMap.setIsGift(1);
+            } else {
+                cartMap.setIsGift(0);
+            }
             List<FsStoreCartScrm> cart = fsStoreCartMapper.selectFsStoreCartList(cartMap);
             FsStoreCartScrm storeCart;
-            if(cart==null||cart.size()==0){
+            if(cart==null || cart.isEmpty()){
                 storeCart = FsStoreCartScrm.builder()
                         .cartNum(cartParam.getCartNum())
                         .productAttrValueId(cartMap.getProductAttrValueId())
@@ -180,6 +185,7 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
                         .isPay(0)
                         .isDel(0)
                         .isBuy(0)
+                        .isGift(cartParam.getIsGift())
                         .build();
                 storeCart.setCreateTime(new Date());
                 checkProductStock(cartParam.getProductId(),storeCart.getProductAttrValueId());

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -24,13 +24,11 @@ import com.fs.common.exception.CustomException;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.company.domain.Company;
-import com.fs.company.domain.CompanyDept;
-import com.fs.company.domain.CompanyMoneyLogs;
-import com.fs.company.domain.CompanyUser;
+import com.fs.company.domain.*;
 import com.fs.company.mapper.CompanyDeptMapper;
 import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyMoneyLogsMapper;
+import com.fs.company.mapper.CompanyUserUserMapper;
 import com.fs.company.service.ICompanyDeptService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyUserService;
@@ -135,7 +133,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
     private IFsStoreOrderStatusScrmService orderStatusService;
     @Autowired
     private FsStoreCartScrmMapper cartMapper;
-
+    @Autowired
+    private CompanyUserUserMapper companyUserUserMapper;
     @Autowired
     private FsUserAddressScrmMapper userAddressMapper;
 
@@ -463,7 +462,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         FsUserAddressScrm address= userAddressMapper.selectFsUserAddressByDefaultAddress(uid);
         List<FsStoreCartQueryVO> carts=cartMapper.selectFsStoreCartListByIds(cartParam.getCartIds());
         for (FsStoreCartQueryVO cart : carts) {
-            if (cart.getChangePrice() != null && BigDecimal.ZERO.compareTo(cart.getChangePrice())<0){
+            if (cart.getChangePrice() != null && BigDecimal.ZERO.compareTo(cart.getChangePrice())<=0){
                 cart.setPrice(cart.getChangePrice());
                 //删除改价
                 FsStoreCartScrm fsStoreCart = new FsStoreCartScrm();
@@ -475,7 +474,25 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         String uuid = IdUtil.randomUUID();
         redisCache.setCacheObject("orderKey:"+uuid, cartParam.getCartIds(), 300, TimeUnit.SECONDS);
         redisCache.setCacheObject("orderCarts:"+uuid, carts, 300, TimeUnit.SECONDS);
-        return R.ok().put("orderKey",uuid).put("address",address).put("carts",carts);
+        List<FsStoreCartQueryVO> giftCarts = new ArrayList<>();
+        if (StringUtils.isNotBlank(cartParam.getGiftCartIds())){
+            giftCarts=cartMapper.selectFsStoreCartListByIds(cartParam.getGiftCartIds());
+            if (giftCarts != null){
+                for (FsStoreCartQueryVO cart : giftCarts) {
+                    if (cart.getChangePrice() != null && BigDecimal.ZERO.compareTo(cart.getChangePrice())<=0){
+                        cart.setPrice(cart.getChangePrice());
+                        //删除改价
+                        FsStoreCartScrm fsStoreCart = new FsStoreCartScrm();
+                        fsStoreCart.setId(cart.getId());
+                        fsStoreCart.setChangePrice(BigDecimal.ZERO);
+                        cartMapper.updateFsStoreCart(fsStoreCart);
+                    }
+                }
+                redisCache.setCacheObject("orderGiftCarts:"+uuid, giftCarts, 300, TimeUnit.SECONDS);
+                redisCache.setCacheObject("orderGiftKey:"+uuid, cartParam.getGiftCartIds(), 300, TimeUnit.SECONDS);
+            }
+        }
+        return R.ok().put("orderKey",uuid).put("address",address).put("carts",carts).put("giftCarts",giftCarts);
 
     }
 
@@ -486,6 +503,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             throw new CustomException("订单已过期",501);
         }
         List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
+        List<FsStoreCartQueryVO> giftCarts = redisCache.getCacheObject("orderGiftCarts:" + param.getOrderKey());
+        if (giftCarts != null) {
+            carts.addAll(giftCarts);
+        }
         BigDecimal payPrice=getOrderSumPrice(carts,"truePrice");
         if(StringUtils.isNotEmpty(param.getCreateOrderKey()))
         {
@@ -586,6 +607,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         if(cartIds!=null){
             //获取购物车列表
             List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
+            List<FsStoreCartQueryVO> giftCarts = redisCache.getCacheObject("orderGiftCarts:" + param.getOrderKey());
+            if (giftCarts != null){
+                carts.addAll(giftCarts);
+            }
             //获取地址
             FsUserAddressScrm address=userAddressMapper.selectFsUserAddressById(param.getAddressId());
             //生成分布式唯一值
@@ -597,22 +622,42 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             storeOrder.setStoreHouseCode("CK01");
             storeOrder.setCompanyId(param.getCompanyId());
             storeOrder.setCompanyUserId(param.getCompanyUserId());
+
+
+            String json = configService.selectConfigByKey("store.config");
+            StoreConfig config= JSONUtil.toBean(json, StoreConfig.class);
+
             //绑定销售
             FsUserScrm fsuser= userService.selectFsUserById(userId);
-            if(param.getCompanyUserId()!=null){
-                if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&& !Objects.equals(fsuser.getCompanyUserId(), param.getCompanyUserId())){
-                    CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
-                    return R.error(String.format("请联系%s销售进行购买商品！",companyUser.getNickName()));
-                }else {
-                    fsuser.setCompanyUserId(param.getCompanyUserId());
-                    userService.updateFsUser(fsuser);
-                }
-                CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
-                if(companyUser!=null){
-                    storeOrder.setDeptId(companyUser.getDeptId());
+            if(ObjectUtil.isNotEmpty(config.getOrderAttribution())
+                    &&config.getOrderAttribution().equals(1)){
+                CompanyUserUser map=new CompanyUserUser();
+                map.setCompanyUserId(param.getCompanyUserId());
+                map.setUserId(userId);
+                List<CompanyUserUser> list= companyUserUserMapper.selectCompanyUserUserList(map);
+                if(list==null||list.size()==0){
+                    CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
+                    if(companyUser!=null&&companyUser.getStatus().equals("0")){
+                        map.setCompanyId(companyUser.getCompanyId());
+                        companyUserUserMapper.insertCompanyUserUser(map);
+                    }
                 }
             }else {
-                storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
+                if(param.getCompanyUserId()!=null){
+                    if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&& !Objects.equals(fsuser.getCompanyUserId(), param.getCompanyUserId())){
+                        CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
+                        return R.error(String.format("请联系%s销售进行购买商品！",companyUser.getNickName()));
+                    }else {
+                        fsuser.setCompanyUserId(param.getCompanyUserId());
+                        userService.updateFsUser(fsuser);
+                    }
+                    CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
+                    if(companyUser!=null){
+                        storeOrder.setDeptId(companyUser.getDeptId());
+                    }
+                }else {
+                    storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
+                }
             }
             storeOrder.setUserId(userId);
             storeOrder.setOrderCode(orderSn);
@@ -668,8 +713,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             storeOrder.setShippingType(1);
             storeOrder.setCreateTime(new Date());
 
-            String json=configService.selectConfigByKey("store.config");
-            StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
             if(config.getServiceFee()!=null){
                 storeOrder.setServiceFee(config.getServiceFee());
             }
@@ -727,7 +770,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             if (storeOrder.getCustomerId() == null){
                 storeOrder.setCustomerId(param.getCustomerId());//6.13 添加客户id
             }
-            FsStoreOrderScrm tempOrder = redisCache.getCacheObject("orderInfo:" + param.getCreateOrderKey());
+            FsStoreOrder tempOrder = redisCache.getCacheObject("orderInfo:" + param.getCreateOrderKey());
             if (tempOrder != null){
                 storeOrder.setOrderType(tempOrder.getOrderType());
                 storeOrder.setOrderMedium(tempOrder.getOrderMedium());
@@ -797,7 +840,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
 
             //删除缓存
             redisCache.deleteObject("orderKey:" + param.getOrderKey());
+            redisCache.deleteObject("orderGiftKey:" + param.getOrderKey());
             redisCache.deleteObject("orderCarts:" + param.getOrderKey());
+            redisCache.deleteObject("orderGiftCarts:" + param.getOrderKey());
 
             //添加记录
             orderStatusService.create(storeOrder.getId(), OrderLogEnum.CREATE_ORDER.getValue(),
@@ -827,6 +872,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             if(StringUtils.isNotEmpty(createOrderKey)){
                 redisCache.deleteObject("createOrderKey:"+ createOrderKey);
                 redisCache.deleteObject("orderCarts:" + createOrderKey);
+                redisCache.deleteObject("orderGiftCarts:" + createOrderKey);
                 redisCache.deleteObject("createOrderMoney:" + createOrderKey);
                 //货到付款自定义金额 key改为id存储
                 BigDecimal amount=redisCache.getCacheObject("createOrderAmount:"+createOrderKey);
@@ -2218,15 +2264,23 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
     }
 
     @Override
-    public R createSalesOrder(CompanyUser companyUser, String cateIds,Integer orderType,Integer orderMedium) {
+    public R createSalesOrder(CompanyUser companyUser, String cateIds,String giftCateIds,Integer orderType,Integer orderMedium) {
         List<FsStoreCartQueryVO>  carts=cartMapper.selectFsStoreCartListByIds(cateIds);
+
+
         String uuid = IdUtil.randomUUID();
         redisCache.setCacheObject("createOrderKey:"+uuid, companyUser.getCompanyId()+"-"+companyUser.getUserId(), 24, TimeUnit.HOURS);
         redisCache.setCacheObject("orderCarts:"+uuid, carts, 24, TimeUnit.HOURS);
+        List<FsStoreCartQueryVO>  giftCarts = new ArrayList<>();
+        //赠品
+        if (giftCateIds != null){
+            giftCarts=cartMapper.selectFsStoreCartListByIds(giftCateIds);
+            redisCache.setCacheObject("orderGiftCarts:"+uuid, giftCarts, 24, TimeUnit.HOURS);
+        }
 
         //2025.7.23 倍力优需求 制单添加订单类型，媒体来源（非必填）
         if (orderType != null || orderMedium != null) {
-            FsStoreOrderScrm fsStoreOrder = new FsStoreOrderScrm();
+            FsStoreOrder fsStoreOrder = new FsStoreOrder();
             fsStoreOrder.setOrderMedium(orderMedium);
             fsStoreOrder.setOrderType(orderType);
             redisCache.setCacheObject("orderInfo:"+uuid, fsStoreOrder, 24, TimeUnit.HOURS);
@@ -2237,19 +2291,38 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
         for(FsStoreCartQueryVO vo:carts){
             totalMoney=totalMoney.add(vo.getPrice().multiply(new BigDecimal(vo.getCartNum().toString())));
         }
+        if (giftCateIds != null){
+            for(FsStoreCartQueryVO vo:giftCarts){
+                totalMoney=totalMoney.add(vo.getPrice().multiply(new BigDecimal(vo.getCartNum().toString())));
+            }
+        }
+
         redisCache.setCacheObject("createOrderMoney:"+uuid, totalMoney, 24, TimeUnit.HOURS);
-        return R.ok().put("orderKey",uuid).put("carts",carts);
+        return R.ok().put("orderKey",uuid).put("carts",carts).put("giftCarts",giftCarts);
     }
 
     @Override
-    public R getSalesOrder(String createOrderKey) {
+    public R getSalesOrder(String createOrderKey,Long userId) {
         String key=redisCache.getCacheObject("createOrderKey:"+createOrderKey);
         List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + createOrderKey);
+        List<FsStoreCartQueryVO> giftCarts = redisCache.getCacheObject("orderGiftCarts:" + createOrderKey);
         BigDecimal money=redisCache.getCacheObject("createOrderMoney:"+createOrderKey);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期",501);
         }
-        return R.ok().put("carts",carts).put("totalMoney",money);
+        if(giftCarts == null){
+            giftCarts=cartMapper.selectFsStoreGiftCartList(userId);
+            if (giftCarts != null && !giftCarts.isEmpty()){
+                //计算总价
+                for(FsStoreCartQueryVO vo:giftCarts){
+                    money=money.add(vo.getPrice().multiply(new BigDecimal(vo.getCartNum().toString())));
+                }
+//                redisCache.setCacheObject("orderGiftCarts:"+createOrderKey, giftCarts, 24, TimeUnit.HOURS);
+//                redisCache.setCacheObject("createOrderMoney:"+createOrderKey, money, 24, TimeUnit.HOURS);
+            }
+        }
+
+        return R.ok().put("carts",carts).put("totalMoney",money).put("giftCarts",giftCarts);
     }
 
     @Override

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreCartQueryVO.java

@@ -65,5 +65,5 @@ import java.math.BigDecimal;
 
     private BigDecimal changePrice;
 
-
+    private Integer isGift;
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreCartVO.java

@@ -38,4 +38,7 @@ import java.math.BigDecimal;
     private Integer stock;
 
     private Integer productType;
+
+
+    private Integer isGift;
 }

fs-service/src/main/resources/application-config-bly.yml

@@ -125,7 +125,7 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs:
-  commonApi: http://172.21.76.167:8010
+  commonApi: http://192.168.0.224:7771
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-service/src/main/resources/application-druid-bly-test.yml

@@ -141,4 +141,4 @@ openIM:
     secret: openIM123
     userID: imAdmin
 #是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: false
+isNewWxMerchant: true

fs-service/src/main/resources/application-druid-bly.yml

@@ -141,4 +141,4 @@ openIM:
     secret: openIM123
     userID: imAdmin
 #是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: false
+isNewWxMerchant: true

fs-user-app/src/main/java/com/fs/app/controller/store/CompanyOrderScrmController.java

@@ -65,6 +65,7 @@ public class CompanyOrderScrmController extends AppBaseController {
     @GetMapping("/createSalesOrder")
     public R createSalesOrder(@RequestParam("token")String token,
                               @RequestParam("cateIds")String cateIds,
+                              @RequestParam(value = "giftCateIds",required = false)String giftCateIds,
                               @RequestParam(value = "orderType",required = false)Integer orderType,
                               @RequestParam(value = "orderMedium",required = false)Integer orderMedium,
                               HttpServletRequest request){
@@ -79,7 +80,7 @@ public class CompanyOrderScrmController extends AppBaseController {
         if(!companyUser.getStatus().equals("0")){
             return R.error("用户已禁用");
         }
-        return orderService.createSalesOrder(companyUser,cateIds,orderType,orderMedium);
+        return orderService.createSalesOrder(companyUser,cateIds,giftCateIds,orderType,orderMedium);
     }
 
     @ApiOperation("改价")
@@ -114,7 +115,8 @@ public class CompanyOrderScrmController extends AppBaseController {
     @ApiOperation("获取订单")
     @GetMapping("/getSalesOrder")
     public R getSalesOrder(@RequestParam("createOrderKey")String createOrderKey, HttpServletRequest request){
-        return orderService.getSalesOrder(createOrderKey);
+        String userId = getUserId();
+        return orderService.getSalesOrder(createOrderKey,Long.valueOf(userId));
     }
     @Login
     @ApiOperation("添加用户购物车")