管乐迷商城改造

mec-application/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -164,11 +164,17 @@ public class APIController extends BaseController {
 	// 商城支付成功/失败修改订单状态
 	@PostMapping("/updateOrder")
 	public HttpResponseResult updateOrder(@RequestBody Map map) throws Exception {
-
 		studentPaymentOrderService.updateOrder(map);
 		return succeed();
 	}
 
+	// 同步商城订单发货状态
+	@PostMapping("/updateShippedStatus")
+	public HttpResponseResult updateShippedStatus(@RequestParam String orderNo) throws Exception {
+		studentPaymentOrderService.updateShippedStatus(orderNo);
+		return succeed();
+	}
+
 
 	/**
 	 * 商城取消订单接口

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SellOrderDao.java

@@ -241,4 +241,6 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     List<Map<Long, String>> getMallProductMap(@Param("productIdList") Set<String> productIdList, @Param("database") String database);
 
     List<String> getMallProductCategory(@Param("database") String database);
+
+    void updateShippedStatus(@Param("orderNo") String orderNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -274,4 +274,7 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     BigDecimal balance(Long userId);
 
     List<OperatingTotalIncomeDto> queryOperatingSummaryIncome(Map<String, Object> params);
+
+    //商品已发货
+    void updateShippedStatus(String orderNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -2201,6 +2201,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         return incomeDtos;
     }
 
+    @Override
+    public void updateShippedStatus(String orderNo) {
+        sellOrderDao.updateShippedStatus(orderNo);
+    }
+
     public BigDecimal getActualAmount(BigDecimal price, StudentPaymentOrderExportDto row) {
         if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
             return price.multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -268,6 +268,9 @@
             where id_ = #{sellOrder.id} and tenant_id_ = #{sellOrder.tenantId}
         </foreach>
     </update>
+    <update id="updateShippedStatus">
+        update sell_order SET delivery_time_ = NOW() where order_no_ = #{orderNo}
+    </update>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         insert into sell_order (organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,

mec-client-api/src/main/java/com/ym/mec/web/WebFeignService.java

@@ -56,6 +56,10 @@ public interface WebFeignService {
 	@PostMapping("/api/updateOrder")
 	HttpResponseResult updateOrder(@RequestBody Map map);
 
+	//商城发货状态同步
+	@PostMapping("/api/updateShippedStatus")
+	HttpResponseResult updateShippedStatus(@RequestParam("orderNo") String orderNo);
+
 	@PostMapping("/api/cancelOrder")
 	HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam("orderNo") String orderNo,@RequestParam("reason") String reason);