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

fs-admin/src/main/java/com/fs/hisStore/FsStoreHealthOrderScrmController.java

@@ -91,7 +91,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
     @Log(title = "健康商城订单", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExport")
     public AjaxResult export1(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }
@@ -130,10 +130,10 @@ public class FsStoreHealthOrderScrmController extends BaseController {
 
 
     @PreAuthorize("@ss.hasPermi('store:healthStoreOrder:exportItems')")
-    @Log(title = "健康商城订单明细导出", businessType = BusinessType.EXPORT)
+    @Log(title = "商城订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExportItems")
     public AjaxResult exportItems1(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderScrmController.java

@@ -217,7 +217,7 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }
@@ -262,7 +262,7 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/exportItems")
     public AjaxResult exportItems(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }

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

@@ -8,4 +8,16 @@ import java.io.Serializable;
 public class AgreementConfig implements Serializable {
     String userAgreement;
     String privacyPolicy;
+    //医生注册协议
+    String doctorRegister;
+    //医生多机构备案协议
+    String doctorFiling;
+    //用户协议
+    String userRegister;
+    //隐私协议
+    String userPrivacy;
+    //健康客服协议
+    String userHealth;
+    //会员服务协议
+    String vipService;
 }

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

@@ -760,7 +760,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
             StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
             FsStoreOrderScrm order=orderService.selectFsStoreOrderByOrderCode(storeAfterSales.getOrderCode());
             if(order.getStoreHouseCode()!=null){
-                if(order.getStoreHouseCode().equals("CQDS001")){
+                if(order.getStoreHouseCode().equals("CK01")){
                     storeAfterSales.setConsignee(config.getRefundConsignee());
                     storeAfterSales.setPhoneNumber(config.getRefundPhoneNumber());
                     storeAfterSales.setAddress(config.getRefundAddress());

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

@@ -551,11 +551,12 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
                 .orElse(val);
 
         //取最小积分
-        Integer minIntegral = values
+        /*Integer minIntegral = values
                 .stream()
                 .map(FsStoreProductAttrValueScrm::getIntegral)
                 .min(Comparator.naturalOrder())
-                .orElse(0);
+                .orElse(0);*/
+        Integer minIntegral = 0;
 
         BigDecimal minOtPrice = values
                 .stream()

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

@@ -3,6 +3,7 @@ package com.fs.app.controller.store;
 
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
 import com.fs.app.param.SignParam;
@@ -24,6 +25,7 @@ import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.dto.ExpressDataDTO;
 import com.fs.hisStore.dto.ExpressInfoDTO;
 import com.fs.hisStore.dto.ExpressNotifyDTO;
+import com.fs.hisStore.enums.SysConfigEnum;
 import com.fs.hisStore.service.*;
 import com.fs.pay.pay.dto.OrderQueryDTO;
 import com.fs.pay.service.IPayService;
@@ -396,6 +398,11 @@ public class CommonScrmController extends AppBaseController {
     public R getStoreConfig() {
         String config = configService.selectConfigByKey("store.config");
         StoreConfig storeConfig = JSONUtil.toBean(config, StoreConfig.class);
+        //资质证书
+        String certs = configUtil.generateConfigByKey(SysConfigEnum.HIS_CERTS.getKey()).getString("certs");
+        storeConfig.setCerts(certs);
+        //退款商家
+        configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey());
         return R.ok().put("data", storeConfig);
 
     }

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

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
-@RequestMapping(value="/h5")
+@RequestMapping(value="/store/h5")
 public class H5ScrmController
 {
 
@@ -22,22 +22,68 @@ public class H5ScrmController
     public ModelAndView userAgreement( )
     {
 
-        String json=configService.selectConfigByKey("store.agreement");
+        String json=configService.selectConfigByKey("his.agreementConfig");
         AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
 
         ModelAndView mv=new ModelAndView();
-        mv.addObject("userAgreement", config.getUserAgreement());
+        mv.addObject("userAgreement", config.getUserRegister());
         mv.setViewName("userAgreement");
+        //return R.ok().put("userAgreement", config.getUserRegister());
         return mv;
     }
     @GetMapping("/privacyPolicy")
     public ModelAndView privacyPolicy( )
     {
-        String json=configService.selectConfigByKey("store.agreement");
+        String json=configService.selectConfigByKey("his.agreementConfig");
         AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
         ModelAndView mv=new ModelAndView();
-        mv.addObject("privacyPolicy", config.getPrivacyPolicy());
+        mv.addObject("privacyPolicy", config.getUserPrivacy());
         mv.setViewName("privacyPolicy");
+        //return R.ok().put("privacyPolicy", config.getUserPrivacy());
+        return mv;
+    }
+    @GetMapping("/doctorRegister")
+    public ModelAndView doctorRegister( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("doctorRegister", config.getDoctorRegister());
+        mv.setViewName("doctorRegister");
+        //return R.ok().put("doctorRegister", config.getDoctorRegister());
+        return mv;
+    }
+    @GetMapping("/doctorFiling")
+    public ModelAndView doctorFiling( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("doctorFiling", config.getDoctorFiling());
+        mv.setViewName("doctorFiling");
+        //return R.ok().put("doctorFiling", config.getDoctorFiling());
+        return mv;
+    }
+    @GetMapping("/userHealth")
+    public ModelAndView userHealth( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("userHealth", config.getUserHealth());
+        mv.setViewName("userHealth");
+        //return R.ok().put("userHealth", config.getUserHealth());
+        return mv;
+    }
+    @GetMapping("/vipService")
+    public ModelAndView vipService( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("vipService", config.getVipService());
+        mv.setViewName("vipService");
+        //return R.ok().put("vipService", config.getVipService());
         return mv;
     }