Преглед изворни кода

pos_order分表

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
a9def9b544
6 измењених фајлова са 24 додато и 24 уклоњено
  1. +9
    -8
      mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/PosOrderService.java
  5. +6
    -13
      mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java
  6. +4
    -0
      mallinkService/src/main/resources/mapper/PosOrderMapper.xml

+ 9
- 8
mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java Прегледај датотеку

@@ -72,23 +72,24 @@ public class PosOrderController extends BaseController {
@ApiOperation("根据id更新接口")
@PostMapping("update")
public ResultData update(@RequestBody PosOrder posOrder) {
posOrder.updateTenantInfo(getTenantInfo());
posOrderService.saveOrUpdate(posOrder);
return new ResultData();
}

@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData delete(Long id) {
posOrderService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
// @ApiOperation("根据id删除接口")
// @GetMapping("/del")
// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
// public ResultData delete(Long id) {
// posOrderService.deleteById(id);
// return new ResultData(Result.SUCCESS, "删除成功", null);
// }

@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS, "查询成功", posOrderService.getById(id));
return new ResultData(Result.SUCCESS, "查询成功", posOrderService.getById(id,getTenantInfo().getTenantId()));
}




+ 2
- 1
mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java Прегледај датотеку

@@ -357,6 +357,7 @@ public class PosBrunService {
updateOrder.setId(posOrderId);
updateOrder.setRemainAmount(remainAmount);
updateOrder.setUpdateDate(new Date());
updateOrder.updateTenantInfo(user);
if (remainAmount.equals(0)) {
updateOrder.setOrderStatus(EnumPosOrderStatus.PAYMENT_SUCCESS.getCode());
retObj.put(WxPayConstant.ORDER_STATUS, EnumPosOrderStatus.PAYMENT_SUCCESS.getCode());
@@ -542,7 +543,7 @@ public class PosBrunService {
}
// 5. 同步给fm pos进程
// 5.1 posOrder信息
PosOrder syncOrder = posOrderService.getById(posOrder.getId());
PosOrder syncOrder = posOrderService.getById(posOrder.getId(),user.getTenantId());
if (syncOrder != null) {
// 5.2 posPayOrder信息
PosPayOrder q = new PosPayOrder();


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/PosOrderMapper.java Прегледај датотеку

@@ -7,6 +7,7 @@ import com.iformall.domain.po.PosOrder;

public interface PosOrderMapper extends CommonMapper<PosOrder, Long> {

PosOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
List<PosOrder> findList(PosOrder posOrder);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/PosOrderService.java Прегледај датотеку

@@ -22,7 +22,7 @@ public interface PosOrderService {
* @param id
* @return
*/
PosOrder getById(Long id);
PosOrder getById(Long id,String tenantId);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface PosOrderService {
*
* @param id
*/
void deleteById(Long id);
//void deleteById(Long id);


+ 6
- 13
mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java Прегледај датотеку

@@ -22,8 +22,8 @@ public class PosOrderServiceImpl implements PosOrderService {
}

@Override
public PosOrder getById(Long id) {
return posOrderMapper.selectById(id);
public PosOrder getById(Long id,String tenantId) {
return posOrderMapper.selectById(id,tenantId);
}

@Override
@@ -41,16 +41,9 @@ public class PosOrderServiceImpl implements PosOrderService {
}
}

@Override
public void deleteById(Long id) {
posOrderMapper.deleteById(id);
}
// @Override
// public void deleteById(Long id) {
// posOrderMapper.deleteById(id);
// }
}

+ 4
- 0
mallinkService/src/main/resources/mapper/PosOrderMapper.xml Прегледај датотеку

@@ -62,6 +62,10 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns" /> from pos_order where id =#{id} and tenant_id = #{tenantId}
</select>
<select id="findList" parameterType="com.iformall.domain.po.PosOrder" resultMap="BaseResultMap">
select <include refid="allColumns" /> from pos_order
<include refid="dynamicWhereConditions" />


Loading…
Откажи
Сачувај