diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index b3eb608cb..317c6fdc6 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -23,7 +23,6 @@ import java.util.*; @RestController @AllArgsConstructor -//@RequestMapping(value = "/p") @Api(description = "POS相关接口") public class PosController extends BaseController { @@ -36,7 +35,7 @@ public class PosController extends BaseController { "\"dev_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," + "\"nonce_str\":\"string(必填)\"}") - @PostMapping("/getPosMemConfigStatus") + @PostMapping("/getPosMemConfig") @SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") public Map getMemStatus(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -51,7 +50,7 @@ public class PosController extends BaseController { logger.info("resKey: " + resKey); try { - retMap = posService.getMemConfigStatus(params); + retMap = posService.getPosMemConfig(params); return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_SUCCESS, null); } catch (MallinkException e) { return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL, @@ -69,6 +68,7 @@ public class PosController extends BaseController { "\"tenant_id\":\"string(必填)\"," + "\"nonce_str\":\"string(必填)\"}") @PostMapping("/getQrCode") + @SystemControllerLog(description = "获取注册二维码及小票二维码规则") public Map getQrCode(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -106,6 +106,7 @@ public class PosController extends BaseController { "\"pos_amount\":\"string(单位:分)(必填)\"," + "\"nonce_str\":\"string(必填)\"}") @PostMapping("/checkMem") + @SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") public Map checkMem(@RequestBody Map params) { JSONObject payContent = new JSONObject(); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/PosService.java b/mallinkPosApi/src/main/java/com/iformall/service/PosService.java index 9c9d777d6..fc3fd5696 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/PosService.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/PosService.java @@ -14,7 +14,7 @@ public interface PosService { * @param params * @return */ - Map getMemConfigStatus(Map params) throws MallinkException; + Map getPosMemConfig(Map params) throws MallinkException; /** * 获取商城二维码 * @param params diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 58cf5e0d7..e50231624 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -58,7 +58,7 @@ public class PosServiceImpl implements PosService { * @return */ @Override - public Map getMemConfigStatus(Map params) throws MallinkException { + public Map getPosMemConfig(Map params) throws MallinkException { Map retMap = new HashMap<>(); String tenantId = params.get(WxPayConstant.TENANT_ID); // 租户ID diff --git a/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java b/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java index efe2bf301..1bf51a780 100644 --- a/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java +++ b/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java @@ -80,14 +80,14 @@ public class PosAppTest { } @Test - public void getPosConfigTest() throws Exception { + public void getPosMemConfigTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); reqObj.put(WxPayConstant.TENANT_ID, tenantId); reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); String reqJsonStr = JSONObject.toJSONString(reqObj); MvcResult result = mockMvc.perform( - MockMvcRequestBuilders.post("/getPosMemConfigStatus") + MockMvcRequestBuilders.post("/getPosMemConfig") .contentType(MediaType.APPLICATION_JSON) .content(reqJsonStr)) .andExpect(MockMvcResultMatchers.status().isOk()) diff --git a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml index 3694b3242..36943fff7 100644 --- a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml @@ -12,7 +12,7 @@ - `id`,`tenant_id`,`discount`,`coupon`,`create_date`,`update_date` + `id`,`tenant_id`,`discount`,`coupon`,`card`,`create_date`,`update_date`