'1'

zzjs-admin/src/main/java/com/miaxis/app/controller/film/FilmController.java

@@ -30,7 +30,7 @@ import static com.miaxis.common.constant.Constants.FILM_BLACK_LIST;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/film/order")
+@RequestMapping(Constants.STUDENT_PREFIX+"/wx/order")
 @Api(tags = {"【小程序-电影】"})
 @Slf4j
 public class FilmController extends BaseController {

zzjs-admin/src/main/java/com/miaxis/app/controller/film/FilmNotifyController.java

@@ -25,7 +25,7 @@ import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/film/notify")
+@RequestMapping(Constants.OPEN_PREFIX+"/wx/notify")
 @Api(tags = {"【小程序-电影回调】"})
 @Slf4j
 public class FilmNotifyController {

zzjs-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -186,38 +186,6 @@ public class WxNotifyController {
 
 
 
-    /**
-     * 电影下单测试
-     */
-    @PostMapping(value = "/wxOrder-test")
-    @ApiOperation("电影订单下单测试")
-    public Response<String> wxOrderNotifytest(String outTradeNo) throws GeneralSecurityException, IOException {
-        String s = "";
-        WxOrder wxOrder1 = wxOrderService.getByOutTradeNo(outTradeNo);
-        FilmDTO filmDTO = new FilmDTO();
-        filmDTO.setUrl("api/order/create");
-        StringBuffer paramData =  new StringBuffer();
-        WxOrderJsonData wxOrderJsonData = JSONObject.parseObject(wxOrder1.getOrderDataJson(), WxOrderJsonData.class);
-        WxOrderCreateDTO wxOrder = wxOrderJsonData.getWxOrderCreateDTO();
-        paramData.append("showId="+wxOrder.getShowId()+"&");
-        paramData.append("seat="+wxOrder.getSeat()+"&");
-        if (wxOrder.getReservedPhone() != null){
-            paramData.append("reservedPhone="+wxOrder.getReservedPhone()+"&");
-        }
-        paramData.append("thirdOrderId="+wxOrder.getThirdOrderId()+"&");
-        paramData.append("notifyUrl="+notifyUrl+"&");
-        if (wxOrder.getSeatId() != null){
-            paramData.append("seatId="+wxOrder.getSeatId()+"&");
-        }
-        if (wxOrder.getSeatNo() != null){
-            paramData.append("seatNo="+wxOrder.getSeatNo()+"&");
-        }
-        paramData.append("acceptChangeSeat="+wxOrder.getAcceptChangeSeat());
-        filmDTO.setParamData(paramData.toString());
-         s = wxOrderService.excuteFilmApi(filmDTO);
-        log.info("电影下单返回值:"+s);
-        return  Response.success(s);
-    }
 
 
 

zzjs-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -48,8 +48,6 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     @Resource
     private WxOrderMapper wxOrderMapper;
 
-    @Autowired
-    private WxpayConfig wxpayConfig;
 
     @Autowired
     private ISysConfigService configService;

zzjs-service/src/main/resources/mapper/film/FilmOrderMapper.xml → zzjs-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -37,11 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxOrderVo">
-        select * from film_order
+        select * from wx_order
     </sql>
 
     <select id="getByOutTradeNo" parameterType="string" resultType="com.miaxis.wx.domain.WxOrder">
-         select * from film_order where out_trade_no =#{outTradeNo}
+         select * from wx_order where out_trade_no =#{outTradeNo}
     </select>
 
 
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectOrderList" resultType="com.miaxis.wx.domain.WxOrder">
-        select * from film_order
+        select * from wx_order
          where openid=#{openid} and trade_state ='SUCCESS'
         <if test="days != null  and days != ''">
             and  DATE_SUB(CURDATE(), INTERVAL #{days} DAY) &lt;= date(create_time)