积分配置调整：积分配置的获取和修改接口调整

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -470,12 +470,14 @@ public class WmMallStoreController {
     @RequestMapping("/get-integral-config")
     public RestResponse getIntegralConfig(Integer wmMallStoreId) {
         //获取已配置的卡券ID
-        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
-        if (!mcuIdResponse.isSuccess()) {
-            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
-        }
-        return ResultControllerUtils.commonResult(memberCardApiService
-                .isGicCalculateIntegral(mcuIdResponse.getResult(), UserDetailUtils.getUserDetail().getEnterpriseId()));
+//        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
+//        if (!mcuIdResponse.isSuccess()) {
+//            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+//        }
+        return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
+                .isGicCalculateIntegral(UserDetailUtils.getUserDetail().getEnterpriseId(),
+                        OrderPointCalculationPartyEnum.WEIMO.getCode(),
+                        Long.valueOf(wmMallStoreId)));
     }
 
     /**
@@ -489,13 +491,21 @@ public class WmMallStoreController {
     
*/
     @RequestMapping("/edit-integral-config")
     public RestResponse editIntegralConfig(Integer wmMallStoreId, String integralRule) {
-        //获取已配置的卡券ID
-        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
-        if (!mcuIdResponse.isSuccess()) {
-            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+        //1：gic计算 0:erp计算
+        int state = 1;
+        if ("erp".equals(integralRule)) {
+            state = 0;
         }
-        return ResultControllerUtils.commonResult(memberCardApiService
-                .updateIntegralRule(mcuIdResponse.getResult(), UserDetailUtils.getUserDetail().getEnterpriseId(), integralRule));
+        //获取已配置的卡券ID
+//        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
+//        if (!mcuIdResponse.isSuccess()) {
+//            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+//        }
+        return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
+                .updateIntegralRule(UserDetailUtils.getUserDetail().getEnterpriseId(),
+                        OrderPointCalculationPartyEnum.WEIMO.getCode(),
+                        Long.valueOf(wmMallStoreId),
+                        state));
     }
 
     @RequestMapping("/list-wm-store-config")