Просмотр исходного кода

[POS][修改]:pos mem config设置

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
03a3cd7dc4
5 измененных файлов: 9 добавлений и 8 удалений
  1. +4
    -3
      mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
  2. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/service/PosService.java
  3. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  4. +2
    -2
      mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml

+ 4
- 3
mallinkPosApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -23,7 +23,6 @@ import java.util.*;


@RestController @RestController
@AllArgsConstructor @AllArgsConstructor
//@RequestMapping(value = "/p")
@Api(description = "POS相关接口") @Api(description = "POS相关接口")
public class PosController extends BaseController { public class PosController extends BaseController {


@@ -36,7 +35,7 @@ public class PosController extends BaseController {
"\"dev_id\":\"string(必填)\"," + "\"dev_id\":\"string(必填)\"," +
"\"tenant_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," +
"\"nonce_str\":\"string(必填)\"}") "\"nonce_str\":\"string(必填)\"}")
@PostMapping("/getPosMemConfigStatus")
@PostMapping("/getPosMemConfig")
@SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") @SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用")
public Map<String, String> getMemStatus(@RequestBody Map<String, String> params) { public Map<String, String> getMemStatus(@RequestBody Map<String, String> params) {
JSONObject payContent = new JSONObject(); JSONObject payContent = new JSONObject();
@@ -51,7 +50,7 @@ public class PosController extends BaseController {
logger.info("resKey: " + resKey); logger.info("resKey: " + resKey);


try { try {
retMap = posService.getMemConfigStatus(params);
retMap = posService.getPosMemConfig(params);
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_SUCCESS, null); return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_SUCCESS, null);
} catch (MallinkException e) { } catch (MallinkException e) {
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL, return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL,
@@ -69,6 +68,7 @@ public class PosController extends BaseController {
"\"tenant_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," +
"\"nonce_str\":\"string(必填)\"}") "\"nonce_str\":\"string(必填)\"}")
@PostMapping("/getQrCode") @PostMapping("/getQrCode")
@SystemControllerLog(description = "获取注册二维码及小票二维码规则")
public Map<String, String> getQrCode(@RequestBody Map<String, String> params) { public Map<String, String> getQrCode(@RequestBody Map<String, String> params) {
JSONObject payContent = new JSONObject(); JSONObject payContent = new JSONObject();


@@ -106,6 +106,7 @@ public class PosController extends BaseController {
"\"pos_amount\":\"string(单位:分)(必填)\"," + "\"pos_amount\":\"string(单位:分)(必填)\"," +
"\"nonce_str\":\"string(必填)\"}") "\"nonce_str\":\"string(必填)\"}")
@PostMapping("/checkMem") @PostMapping("/checkMem")
@SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用")
public Map<String, String> checkMem(@RequestBody Map<String, String> params) { public Map<String, String> checkMem(@RequestBody Map<String, String> params) {
JSONObject payContent = new JSONObject(); JSONObject payContent = new JSONObject();




+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/service/PosService.java Просмотреть файл

@@ -14,7 +14,7 @@ public interface PosService {
* @param params * @param params
* @return * @return
*/ */
Map<String, String> getMemConfigStatus(Map<String, String> params) throws MallinkException;
Map<String, String> getPosMemConfig(Map<String, String> params) throws MallinkException;
/** /**
* 获取商城二维码 * 获取商城二维码
* @param params * @param params


+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -58,7 +58,7 @@ public class PosServiceImpl implements PosService {
* @return * @return
*/ */
@Override @Override
public Map<String, String> getMemConfigStatus(Map<String, String> params) throws MallinkException {
public Map<String, String> getPosMemConfig(Map<String, String> params) throws MallinkException {
Map<String, String> retMap = new HashMap<>(); Map<String, String> retMap = new HashMap<>();


String tenantId = params.get(WxPayConstant.TENANT_ID); // 租户ID String tenantId = params.get(WxPayConstant.TENANT_ID); // 租户ID


+ 2
- 2
mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java Просмотреть файл

@@ -80,14 +80,14 @@ public class PosAppTest {
} }


@Test @Test
public void getPosConfigTest() throws Exception {
public void getPosMemConfigTest() throws Exception {
Map<String, String> reqObj = new HashMap<>(); Map<String, String> reqObj = new HashMap<>();
reqObj.put(WxPayConstant.DEV_ID, devId); reqObj.put(WxPayConstant.DEV_ID, devId);
reqObj.put(WxPayConstant.TENANT_ID, tenantId); reqObj.put(WxPayConstant.TENANT_ID, tenantId);
reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey));
String reqJsonStr = JSONObject.toJSONString(reqObj); String reqJsonStr = JSONObject.toJSONString(reqObj);
MvcResult result = mockMvc.perform( MvcResult result = mockMvc.perform(
MockMvcRequestBuilders.post("/getPosMemConfigStatus")
MockMvcRequestBuilders.post("/getPosMemConfig")
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.content(reqJsonStr)) .content(reqJsonStr))
.andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.status().isOk())


+ 1
- 1
mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml Просмотреть файл

@@ -12,7 +12,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`discount`,`coupon`,`create_date`,`update_date`
`id`,`tenant_id`,`discount`,`coupon`,`card`,`create_date`,`update_date`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить