cid 的显示/退款/商城商品库存显示

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -926,35 +926,40 @@ public class Task {
     }
 
     public void CreateWeizouErpPush() {
-        List<Long> omsList = fsStoreOrderMapper.selectFsStoreOrderNoCreateOms();
-        List<Long> integrals = fsIntegralOrderMapper.selectFsStoreOrderNoCreateOms();
-        List<Long> scrms = fsStoreOrderScrmMapper.selectFsStoreOrderNoCreateOms();
-        logger.info("推送订单id====>{}", omsList);
-        logger.info("推送积分订单id====>{}", integrals);
-        logger.info("推送SCRM订单id====>{}", scrms);
-
-        for (Long l : omsList) {
-            try {
-                fsStoreOrderService.weizouPush(l);
-            } catch (Exception e) {
-                logger.error("推送订单异常：", e);
+        try {
+            List<Long> omsList = fsStoreOrderMapper.selectFsStoreOrderNoCreateOms();
+            List<Long> integrals = fsIntegralOrderMapper.selectFsStoreOrderNoCreateOms();
+            List<Long> scrms = fsStoreOrderScrmMapper.selectFsStoreOrderNoCreateOms();
+            logger.info("推送订单id====>{}", omsList);
+            logger.info("推送积分订单id====>{}", integrals);
+            logger.info("推送SCRM订单id====>{}", scrms);
+
+            for (Long l : omsList) {
+                try {
+                    fsStoreOrderService.weizouPush(l);
+                } catch (Exception e) {
+                    logger.error("推送订单异常：", e);
+                }
             }
-        }
-        for (Long l : integrals) {
-            try {
-                fsStoreOrderService.weizouPushIntergral(l);
-            } catch (Exception e) {
-                logger.error("推送积分订单异常：", e);
+            for (Long l : integrals) {
+                try {
+                    fsStoreOrderService.weizouPushIntergral(l);
+                } catch (Exception e) {
+                    logger.error("推送积分订单异常：", e);
+                }
             }
-        }
-        for (Long l : scrms) {
-            try {
-                fsStoreOrderService.weizouPushScrm(l);
-            } catch (Exception e) {
-                logger.error("推送SCRM订单异常：", e);
+            for (Long l : scrms) {
+                try {
+                    fsStoreOrderService.weizouPushScrm(l);
+                } catch (Exception e) {
+                    logger.error("推送SCRM订单异常：", e);
+                }
             }
+        }catch (Exception e){
+            logger.error("推送订单异常：", e);
         }
-    }
+        }
+
     public void CreateOmsAndHis() {
         List<Long> omsList = fsStoreOrderMapper.selectFsStoreOrderNoCreateOms();
         logger.info("推送订单id====>{}", omsList);

fs-service/src/main/java/com/fs/common/service/impl/SmsServiceImpl.java

@@ -1043,7 +1043,7 @@ public class SmsServiceImpl implements ISmsService
      * @param temp
      * @param param
      */
-//    @Async
+    @Async
     public void batchSmsOp4AiSend(CompanySmsTemp temp, SmsSendBatchParam param){
         CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
         CompanyVoiceRoboticCallBlacklistCheckParam companyVoiceRoboticCallBlacklistCheckParam = new CompanyVoiceRoboticCallBlacklistCheckParam();
@@ -1106,6 +1106,7 @@ public class SmsServiceImpl implements ISmsService
                 } catch (UnsupportedEncodingException e) {
                     e.printStackTrace();
                 }
+
                 String post = HttpRequest.get(urls)
 //                            .body(String.valueOf(jsonObject))
                         .execute().body();

fs-service/src/main/java/com/fs/company/mapper/CompanyVoiceRoboticCalleesMapper.java

@@ -34,7 +34,7 @@ public interface CompanyVoiceRoboticCalleesMapper extends BaseMapper<CompanyVoic
     public List<CompanyVoiceRoboticCallees> selectCompanyVoiceRoboticCalleesList(CompanyVoiceRoboticCallees companyVoiceRoboticCallees);
 
     @Select("select cv.*,cw.is_add,cw.customer_id from company_voice_robotic_callees  cv " +
-            "left join  company_wx_client cw on cv.robotic_id = cw.robotic_id " +
+            "inner join  company_wx_client cw on cv.robotic_id = cw.robotic_id and cv.user_id=cw.customer_id " +
             "where cv.robotic_id = #{roboticId}")
     public List<CompanyVoiceRoboticCallees> selectCompanyVoiceRoboticCalleesListByRoboticId(@Param("roboticId") Long id);
 

fs-service/src/main/java/com/fs/his/mapper/FsUserIntegralLogsMapper.java

@@ -77,7 +77,7 @@ public interface FsUserIntegralLogsMapper
             "LEFT JOIN fs_user u ON u.user_id=l.user_id "+
             " <where>  \n" +
             "            <if test=\"userId != null \"> and l.user_id = #{userId}</if>\n" +
-            "            <if test=\"nick_name != null \"> and u.nick_name = #{nickName}</if>\n" +
+            "            <if test=\"nickName != null \"> and u.nick_name = #{nickName}</if>\n" +
             "            <if test=\"logType != null  and logType != ''\"> and log_type = #{logType}</if>\n" +
             "            <if test=\"phone != null \"> and u.phone = #{phone}</if>\n" +
             "            <if test=\"businessId != null  and businessId != ''\"> and business_id = #{businessId}</if>\n" +

fs-service/src/main/java/com/fs/his/param/FsUserIntegralLogsParam.java

@@ -26,6 +26,7 @@ public class FsUserIntegralLogsParam {
     /** 积分余额 */
     @Excel(name = "积分余额")
     private Long balance;
+
     private String nickName;
 
     private String phone;

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

@@ -1006,7 +1006,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
                 FsStoreOrderItemVO itemVO = orderItemVOS.stream().filter(i -> i.getProductId().equals(item.getProductId())).findFirst().orElse(null);
                 if(Objects.nonNull(itemVO) && itemVO.getIsAfterSales() == 1 && Objects.nonNull(item.getNum())){
                     // 1商城订单 2 直播订单
-                    if (order.getOrderType()==1) {
+                    if (order.getOrderType()==1 || order.getOrderType()==0) {
                         productService.incProductStock(item.getNum().longValue(), item.getProductId(), null);
                     }else if(order.getOrderType()==2){
                     // 是个bug,直播订单合并到商城订单，购买的时候  +直播商品库存-直播商品销量，取消的时候又+商品管理库存-商品管理销量（反正销量和库存可以随便改，这里直播库存暂定不做修改了）

fs-service/src/main/resources/application-config-druid-sxsm.yml

@@ -97,7 +97,7 @@ headerImg:
   #下载海报地址
   download_poster_url: https://sxsm-1431314362.cos.ap-chongqing.myqcloud.com/sxsm.jpg
 ipad:
-  ipadUrl: http://ipad
+  ipadUrl: http://ipad.mxzjkwbvk.cn
   aiApi: http://49.232.181.28:3000/api
   wxIpadUrl:
   voiceApi:

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

@@ -251,6 +251,12 @@ public class ProductScrmController extends AppBaseController {
             }
         }
 
+
+        //临时做个修改 商城的订单 压根不需要商品属性值对象里的库存，表结构对应不上，改成 商品库存
+        // 将 productValues 中每个元素的 stock 替换为 product 的 stock
+        if (productValues != null && product.getStock() != null) {
+            productValues.forEach(value -> value.setStock(product.getStock().intValue()));
+        }
         return R.ok().put("product",product)
                 .put("productAttr",productAttr)
                 .put("productValues",productValues)