fix:代服推送获取不到产品规格以及优惠券名称查询

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -1521,9 +1521,10 @@ public class DfOrderServiceImpl implements IErpOrderService {
                 Asserts.check(ObjectUtils.isNotNull(product), "该产品不存在! 产品id: {} ", item.getProductId());
                 skuVo.setProductName(product.getProductName()); //商品名称
                 com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(item.getJsonInfo());
-                String skuCode = jsonObject.getString("sku"); //sku编码
+                String sku = jsonObject.getString("sku");
+                String skuCode = sku; //sku编码
                 String barCode = jsonObject.getString("barCode");
-                if (StringUtils.isBlank(skuCode) || StringUtils.isBlank(skuCode)) {
+                if (StringUtils.isBlank(skuCode) || StringUtils.isBlank(skuCode) || StringUtils.isBlank(barCode)) {
                     //查询商品编号
                     FsStoreProductAttrValueScrm attrValueMap=new FsStoreProductAttrValueScrm();
                     attrValueMap.setProductId(item.getProductId());
@@ -1531,6 +1532,7 @@ public class DfOrderServiceImpl implements IErpOrderService {
                     if (values != null) {
                         barCode = StringUtils.isBlank(barCode)?values.get(0).getBarCode().trim():barCode;
                         skuCode = StringUtils.isBlank(skuCode)?values.get(0).getSku().trim():skuCode;
+                        sku = StringUtils.isBlank(sku)?values.get(0).getSku():sku;
                     }
                 }
 
@@ -1541,7 +1543,7 @@ public class DfOrderServiceImpl implements IErpOrderService {
                 } else {
                     skuVo.setProductCode(item.getProductId().toString()); //商品编号
                 }
-                skuVo.setAttributeNames(jsonObject.getString("sku")); //商品规格，格式：颜色：红色，尺寸：L码....以此类推
+                skuVo.setAttributeNames(sku); //商品规格，格式：颜色：红色，尺寸：L码....以此类推
                 skuVo.setProductNumber(Math.toIntExact(item.getNum())); //商品预定数量
                 skuVo.setPrice(product.getPrice().doubleValue()); //商品单价
 

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

@@ -95,7 +95,10 @@ public interface FsStoreCouponIssueScrmMapper
             "<if test = 'maps.couponPrice != null     '> " +
             "and c.coupon_price =  #{maps.couponPrice} " +
             "</if>" +
-            " order by c.coupon_price desc "+
+            "<if test='maps.couponName != null and maps.couponName != \"\"'> " +
+            "and i.coupon_name like concat(#{maps.couponName},'%') " +
+            "</if>" +
+            " order by c.coupon_price desc " +
             "</script>"})
     List<FsStoreCouponIssueVO> getCompanyCouponIssueList(@Param("maps") FsCouponIssueParam map);
     @Select({"<script> " +

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

@@ -13,4 +13,5 @@ public class FsCouponIssueParam extends BaseQueryParam implements Serializable
     private Integer cateId;
     private Integer couponType;
     private BigDecimal couponPrice;
+    private String couponName;
 }

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

@@ -7,6 +7,6 @@ import java.io.Serializable;
 @Data
 public class FsCouponUserParam  implements Serializable
 {
-
+    private String couponName; //优惠券名称
 
 }

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

@@ -2245,7 +2245,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }
             } else {
                 ErpOrderItem item = new ErpOrderItem();
-                item.setItem_code(cartDTO.getBarCode().trim());
+                String barCode = cartDTO.getBarCode();
+                if (StringUtils.isNotBlank(barCode)) {
+                    item.setItem_code(barCode.trim());
+                }
                 item.setPrice(cartDTO.getPrice().toString());
                 item.setQty(cartDTO.getNum());
                 item.setRefund(0);

fs-service/src/main/resources/mapper/hisStore/FsStoreCouponUserScrmMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="couponId != null "> and coupon_id = #{couponId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="couponTitle != null  and couponTitle != ''"> and coupon_title = #{couponTitle}</if>
+            <if test="couponTitle != null and couponTitle != ''"> and coupon_title like concat(#{couponTitle},'%')</if>
             <if test="couponPrice != null "> and coupon_price = #{couponPrice}</if>
             <if test="useMinPrice != null "> and use_min_price = #{useMinPrice}</if>
             <if test="limitTime != null "> and limit_time = #{limitTime}</if>

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

@@ -66,6 +66,7 @@ public class CouponScrmController extends AppBaseController {
     public R getMyCouponList(FsCouponUserParam param, HttpServletRequest request){
         try {
             FsStoreCouponUserScrm map=new FsStoreCouponUserScrm();
+            map.setCouponTitle(param.getCouponName());
             map.setIsDel(0);
             map.setUserId(Long.parseLong(getUserId()));
             List<FsStoreCouponUserScrm> list=fsStoreCouponUserService.selectFsStoreCouponUserList(map);