Merge remote-tracking branch 'origin/master' into 会员关联项目

# Conflicts:
#	fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java
#	fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java
#	fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

fs-service-system/src/main/java/com/fs/erp/service/impl/WdtErpGoodsServiceImpl.java

@@ -100,8 +100,8 @@ public class WdtErpGoodsServiceImpl implements IErpGoodsService {
                 for (ErpWdtStockDTO stock : stocks) {
                     ErpGoodsStock erpGoodsStock = new ErpGoodsStock();
                     erpGoodsStock.setBarcode(barcode);
-                    erpGoodsStock.setQty(stock.getStock_num());
-                    erpGoodsStock.setSalable_qty(stock.getAvaliable_num());
+                    erpGoodsStock.setQty(stock.getStock_num().split("\\.")[0]); //999979.0000
+                    erpGoodsStock.setSalable_qty(stock.getAvaliable_num().split("\\.")[0]); //999976.0000
                     list.add(erpGoodsStock);
                 }
             } else {

fs-service-system/src/main/java/com/fs/store/domain/FsStoreOrder.java

@@ -261,4 +261,6 @@ public class FsStoreOrder extends BaseEntity
 
     private BigDecimal serviceFee;
 
+    private Integer orderMedium; //媒体来源
+
 }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -1037,7 +1037,7 @@ public interface FsStoreOrderMapper
 
     List<Report> selectOrderByCustomerIds(@Param("map") ReportParam param);
 
-    int selectFsStoreOrderByCount(FsStoreOrderStatisticsParam param);
+    int selectFsStoreOrderCountByParam(FsStoreOrderStatisticsParam param);
 
     BigDecimal selectFsStoreOrderByPayPriceCount(FsStoreOrderStatisticsParam param);
 

fs-service-system/src/main/java/com/fs/store/param/FsStoreOrderCreateParam.java

@@ -51,4 +51,7 @@ public class FsStoreOrderCreateParam implements Serializable
     private Long customerId;
 
     private BigDecimal amount; //货到付款代收金额
+
+    private Integer orderType; //订单类型
+    private Integer orderMedium; //媒体来源
 }

fs-service-system/src/main/java/com/fs/store/param/FsStoreOrderCreateUserParam.java

@@ -30,4 +30,6 @@ public class FsStoreOrderCreateUserParam implements Serializable
     private BigDecimal payPrice; //改价 订单总价
     private Long customerId;
     private BigDecimal amount; //货到付款代收金额
+    private Integer orderType; //订单类型
+    private Integer orderMedium; //媒体来源
 }

fs-service-system/src/main/java/com/fs/store/param/FsStoreOrderParam.java

@@ -85,6 +85,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     /**
      * 支付状态 待支付 1已支付
      */
-    private int paidStatus;
+    private Integer paidStatus;
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreCartServiceImpl.java

@@ -230,7 +230,7 @@ public class FsStoreCartServiceImpl implements IFsStoreCartService
         if(StringUtils.isEmpty(productAttrValue.getGroupBarCode())){
             //单品
             ErpGoodsStockQueryRequert queryRequert = new ErpGoodsStockQueryRequert();
-            queryRequert.setBarcode(productAttrValue.getGroupBarCode());
+            queryRequert.setBarcode(productAttrValue.getBarCode());
             ErpGoodsStockQueryResponse goodsStock = goodsService.getGoodsStock(queryRequert);
             if(goodsStock != null && goodsStock.getStocks() != null && !goodsStock.getStocks().isEmpty()){
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -618,6 +618,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             if (storeOrder.getCustomerId() == null){
                 storeOrder.setCustomerId(param.getCustomerId());//6.13 添加客户id
             }
+            storeOrder.setOrderType(param.getOrderType());
+            storeOrder.setOrderMedium(param.getOrderMedium());
             Integer flag=fsStoreOrderMapper.insertFsStoreOrder(storeOrder);
             if (flag==0) {
                 return R.error("订单创建失败");
@@ -1030,6 +1032,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             createParam.setCustomerId(param.getCustomerId());
             createParam.setAmount(param.getAmount());
             createParam.setOrderCreateType(3); //后台制单
+            createParam.setOrderType(param.getOrderType());
+            createParam.setOrderMedium(param.getOrderMedium()); //后台制单
             return this.createOrder(param.getUserId(),createParam);
         }
         else{
@@ -2191,7 +2195,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
     @Override
     public Integer selectFsStoreOrderCount(FsStoreOrderStatisticsParam param) {
-        return fsStoreOrderMapper.selectFsStoreOrderByCount(param);
+        return fsStoreOrderMapper.selectFsStoreOrderCount(param);
     }
 
     @Override

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -81,6 +81,11 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
+      - appid: wx328c85d0437b5a66   #中康未来智慧服务
+        secret: fa00dce55bc4b6cdc1c692c0496ee2af
+        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
 
   pay:
     appId: wx11a2ce7c2bbc4521 #微信公众号或者小程序等的appid

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

@@ -1,5 +1,7 @@
 # 数据源配置
 spring:
+    profiles:
+        include: config-bly,common
     # redis 配置
     redis:
         # 地址
@@ -28,7 +30,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://113.44.133.86:3306/bly_store_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://113.44.133.86:3306/bly_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: bly@2025
                 # 从库数据源

fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -88,10 +88,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scheduleId"    column="schedule_id"    />
         <result property="orderVisit"    column="order_visit"    />
         <result property="serviceFee"    column="service_fee"    />
+        <result property="orderMedium"    column="order_medium"    />
     </resultMap>
 
     <sql id="selectFsStoreOrderVo">
-        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id from fs_store_order
+        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id,order_medium from fs_store_order
     </sql>
 
     <select id="selectFsStoreOrderList" parameterType="FsStoreOrder" resultMap="FsStoreOrderResult">
@@ -242,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliverySendTime != null">delivery_send_time,</if>
             <if test="orderVisit != null">order_visit,</if>
             <if test="serviceFee != null">service_fee,</if>
+            <if test="orderMedium != null">order_medium,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderCode != null and orderCode != ''">#{orderCode},</if>
@@ -323,6 +325,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliverySendTime != null">#{deliverySendTime},</if>
             <if test="orderVisit != null">#{orderVisit},</if>
             <if test="serviceFee != null">#{serviceFee},</if>
+            <if test="orderMedium != null">#{orderMedium},</if>
          </trim>
     </insert>
 
@@ -410,6 +413,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scheduleId != null">schedule_id = #{scheduleId},</if>
             <if test="orderVisit != null">order_visit = #{orderVisit},</if>
             <if test="serviceFee != null">service_fee = #{serviceFee},</if>
+            <if test="orderMedium != null">order_medium = #{orderMedium},</if>
         </trim>
         where id = #{id}
     </update>
@@ -509,7 +513,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectFsStoreOrderByCount" resultType="int">
+    <select id="selectFsStoreOrderCountByParam" resultType="int">
         select  count(id) from fs_store_order
         <where>
             <if test="startTime != null and startTime != ''">AND date_format(create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')</if>

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -101,6 +101,7 @@
     <select id="selectFsUserList" parameterType="FsUser" resultMap="FsUserResult">
         <include refid="selectFsUserVo"/>
         <where>
+            <if test="userId != null">and user_id = #{userId}</if>
             <if test="username != null  and username != ''">and username like concat('%', #{username}, '%')</if>
             <if test="password != null  and password != ''">and password = #{password}</if>
             <if test="realName != null  and realName != ''">and real_name like concat('%', #{realName}, '%')</if>