麦咖啡订单推送

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -112,5 +112,17 @@ public class OrderApplication {
             executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
             return executor;
         }
+
+        @Bean("mcCafePushOrderExecutor")
+        public Executor mcCafePushOrderExecutor() {
+            ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+            executor.setCorePoolSize(8);
+            executor.setMaxPoolSize(10);
+            executor.setQueueCapacity(20000);
+            executor.setKeepAliveSeconds(60);
+            executor.setThreadNamePrefix("McCafePushOrderExecutor-");
+            executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+            return executor;
+        }
     }
 }

order-application-service/src/main/java/cn/freemud/controller/McCafeController.java

@@ -120,6 +120,19 @@ public class McCafeController {
         return mcCafeOrderService.mcCafeQueryRecentOrder(queryOrderVo);
     }
 
+
+
+    /**
+     * 麦咖啡推送订单数据到麦当劳
+     */
+    @ApiAnnotation(logMessage = "mcCafePushOrder")
+    @PostMapping("/mcCafePushOrder")
+    public BaseResponse mcCafePushOrder(@Validated @LogParams @RequestBody McCafeQueryOrderVo queryOrderVo) {
+        return mcCafeOrderService.mcCafePushOrder(queryOrderVo);
+    }
+
+
+
 }
 
 

order-application-service/src/main/java/cn/freemud/entities/db/PushMccafeOrder.java

+package cn.freemud.entities.db;
+
+import cn.freemud.comm.entity.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 商户
+ *
+ * @author liming.guo
+ * @date 2018/05/10
+ */
+@Data
+public class PushMccafeOrder extends BaseEntity {
+
+    private Long id;
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+    /**
+     * 商户ID
+     */
+    private String partnerId;
+    /**
+     * 门店id
+     */
+    private String storeId;
+
+    private Integer status;
+
+    private String failReason;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/order/RefundQueryRequestDto.java

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayRequestDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:28
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class RefundQueryRequestDto {
+
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String clientCode;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/order/RefundQueryResponseDto.java

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayResponseDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:23
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class RefundQueryResponseDto {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String tradeNo;
+    private String thirdPartTradeNo;
+    private String totalAmount;
+    private String refundCount;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/McCafePushOrderVo.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: QueryOrderVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/5/22 17:35
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class McCafePushOrderVo {
+
+    @NotBlank
+    private String startDate;
+
+    @NotBlank
+    private String endDate;
+
+}

order-application-service/src/main/java/cn/freemud/manager/PushMccafeOrderManager.java

+package cn.freemud.manager;
+
+import cn.freemud.entities.db.Partner;
+import cn.freemud.entities.db.PushMccafeOrder;
+import cn.freemud.manager.dao.PartnerDao;
+import cn.freemud.manager.dao.PushMccafeOrderDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 商户小程序manager
+ *
+ * @author liming.guo
+ * @date 2018/05/10
+ */
+@Component
+public class PushMccafeOrderManager {
+
+    @Autowired
+    private PushMccafeOrderDao pushMccafeOrderDao;
+
+    public Integer insertOrder(PushMccafeOrder pushMccafeOrder) {
+        return pushMccafeOrderDao.insertOrder(pushMccafeOrder);
+    }
+
+    public Integer updateOrder(PushMccafeOrder pushMccafeOrder) {
+        return pushMccafeOrderDao.updateOrder(pushMccafeOrder);
+    }
+
+}

order-application-service/src/main/java/cn/freemud/manager/dao/PushMccafeOrderDao.java

+package cn.freemud.manager.dao;
+
+import cn.freemud.entities.db.Partner;
+import cn.freemud.entities.db.PushMccafeOrder;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PushMccafeOrderDao {
+
+    Integer insertOrder(PushMccafeOrder pushMccafeOrder);
+
+    Integer updateOrder(PushMccafeOrder pushMccafeOrder);
+
+}

order-application-service/src/main/java/cn/freemud/service/MCCafeOrderService.java

@@ -55,4 +55,6 @@ public interface MCCafeOrderService {
      */
     BaseResponse mcCafeQueryRecentOrder(McCafeQueryOrderVo queryOrderVo);
 
+    BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo);
+
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java

@@ -43,12 +43,11 @@ public interface CustomerClient {
     // @PostMapping(value = "/customerservice/updateMemberChannel")
     // JSONObject updateUserUnionId(@RequestBody UpdateMemUnionIdRequestDto updateMemUnionIdRequestDto);
     //
-    // /**
-    // * 根据会员id获取会员信息
-    // */
-    // @PostMapping(value = "/customerservice/getMemberById")
-    // GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto
-    // getMemberInfoByIdRequestDto);
+     /**
+     * 根据会员id获取会员信息
+     */
+     @PostMapping(value = "/customerservice/getMemberById")
+     GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto);
     //
     // /**
     // * 修改顾客信息

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

@@ -3,6 +3,7 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.entities.dto.order.FacePayRequestDto;
 import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.RefundQueryResponseDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,4 +34,8 @@ public interface PaymentNewClient {
     @PostMapping("paymentcenter/facePay")
     com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
 
+    @LogIgnoreFeign(logMessage="refundQuery")
+    @PostMapping("paymentcenter/refundQuery")
+    com.freemud.application.sdk.api.base.BaseResponse<RefundQueryResponseDto> refundQuery(@RequestBody FacePayRequestDto orderPayDto);
+
 }